[47401] trunk/dports/x11/gtk2/Portfile

[jeremyhu at macports.org]

Revision: 47401
          http://trac.macports.org/changeset/47401
Author:   jeremyhu at macports.org
Date:     2009-02-27 17:15:21 -0800 (Fri, 27 Feb 2009)
Log Message:
-----------
gtk2: Set configure.args for system_x11 during pre_configure so it doesn't get set during dependency generation for non-system_x11 users

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

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-02-28 00:52:56 UTC (rev 47400)
+++ trunk/dports/x11/gtk2/Portfile	2009-02-28 01:15:21 UTC (rev 47401)
@@ -139,13 +139,15 @@
     # 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
-        configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-        configure.cppflags-append -I${x11prefix}/include
-        configure.ldflags-append  -L${x11prefix}/lib
- 
+        pre-configure {
+            # 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
+            configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
+            configure.cppflags-append -I${x11prefix}/include
+            configure.ldflags-append  -L${x11prefix}/lib
+        }
+
         # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
         post-destroot {
             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090227/6fbd2279/attachment-0001.html>