[49984] trunk/dports/gnome/at-spi/Portfile

[blb at macports.org]

Revision: 49984
          http://trac.macports.org/changeset/49984
Author:   blb at macports.org
Date:     2009-04-21 14:02:17 -0700 (Tue, 21 Apr 2009)
Log Message:
-----------
gnome/at-spi - use jeremyhu's method of better supporting X11 with or without
+system_x11; remove unrecognized --enable-platform-gnome-2

Modified Paths:
--------------
    trunk/dports/gnome/at-spi/Portfile

Modified: trunk/dports/gnome/at-spi/Portfile
===================================================================
--- trunk/dports/gnome/at-spi/Portfile	2009-04-21 20:52:40 UTC (rev 49983)
+++ trunk/dports/gnome/at-spi/Portfile	2009-04-21 21:02:17 UTC (rev 49984)
@@ -31,13 +31,23 @@
 
 use_bzip2           yes
 
-configure.args      --enable-static --enable-platform-gnome-2 --disable-xevie
+configure.args      --enable-static --disable-xevie
 
 configure.env       PYTHON=${prefix}/bin/python2.5
 
 variant x11 conflicts quartz description {Use X11 (default)} {
    configure.args-append     --with-x
-   configure.cflags-append   -I${x11prefix}/include
+   # 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 quartz conflicts x11 description {Use Quartz (broken)} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090421/d8a8a1a7/attachment-0001.html>