[47540] trunk/dports/graphics/SimGear/Portfile

[jeremyhu at macports.org]

Revision: 47540
          http://trac.macports.org/changeset/47540
Author:   jeremyhu at macports.org
Date:     2009-02-28 16:19:59 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
SimGear: Update our AC_X_PATH workaround

Modified Paths:
--------------
    trunk/dports/graphics/SimGear/Portfile

Modified: trunk/dports/graphics/SimGear/Portfile
===================================================================
--- trunk/dports/graphics/SimGear/Portfile	2009-03-01 00:14:44 UTC (rev 47539)
+++ trunk/dports/graphics/SimGear/Portfile	2009-03-01 00:19:59 UTC (rev 47540)
@@ -28,14 +28,13 @@
 
 configure.args	--with-x
 
-# This block helps us link correctly and setup our pc files correctly when we are
-# +system_x11 and x11prefix is somewhere non-standard
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] && ![file exists ${x11prefix}/lib/pkgconfig/x11.pc] } {
-    # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-    # These next three lines should cause AC_X_PATH to let us setup our CPPFLAGS
-    # and LDFLAGS without interference
+# 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.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
         configure.cppflags-append -I${x11prefix}/include
         configure.ldflags-append  -L${x11prefix}/lib
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/369dc948/attachment.html>