[49861] trunk/dports/x11/aterm/Portfile

[jeremyhu at macports.org]

Revision: 49861
          http://trac.macports.org/changeset/49861
Author:   jeremyhu at macports.org
Date:     2009-04-19 02:35:21 -0700 (Sun, 19 Apr 2009)
Log Message:
-----------
aterm: Use expected X11 includes and libs

Modified Paths:
--------------
    trunk/dports/x11/aterm/Portfile

Modified: trunk/dports/x11/aterm/Portfile
===================================================================
--- trunk/dports/x11/aterm/Portfile	2009-04-19 08:52:58 UTC (rev 49860)
+++ trunk/dports/x11/aterm/Portfile	2009-04-19 09:35:21 UTC (rev 49861)
@@ -30,9 +30,16 @@
                --enable-menubar --enable-transparency \
                --enable-wtmp
 
-if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-    configure.args-append   --x-includes=${prefix}/include \
-                            --x-libraries=${prefix}/lib
+# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
+# This block helps us link correctly and setup our pc files correctly when we   
+# are +system_x11 and x11prefix is somewhere non-standard and should cause
+# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
+configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
+if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+    pre-configure {
+        configure.cppflags-append -I${x11prefix}/include
+        configure.ldflags-append  -L${x11prefix}/lib
+    }
 }
 
 variant afterstep description {Enable AfterStep integration} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090419/09239dc0/attachment-0001.html>