[47565] trunk/dports/math/R/Portfile

[jeremyhu at macports.org]

Revision: 47565
          http://trac.macports.org/changeset/47565
Author:   jeremyhu at macports.org
Date:     2009-02-28 17:08:33 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
R: Update AC_X_PATH workaround

Modified Paths:
--------------
    trunk/dports/math/R/Portfile

Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile	2009-03-01 01:07:40 UTC (rev 47564)
+++ trunk/dports/math/R/Portfile	2009-03-01 01:08:33 UTC (rev 47565)
@@ -43,10 +43,17 @@
 
 universal_variant no
 
-# autoreconfing to pick up X11 is not playing nicely, so do this instead.
-# hopefully upsteream will use a newer autoconf next time...
-configure.cppflags-append -I${x11prefix}/include
-configure.ldflags-append -L${x11prefix}/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 gcc42 description {Build with gcc42} {
     configure.compiler macports-gcc-4.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/fec9082f/attachment.html>