[47563] trunk/dports/net/logjam/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Sat Feb 28 17:04:56 PST 2009


Revision: 47563
          http://trac.macports.org/changeset/47563
Author:   jeremyhu at macports.org
Date:     2009-02-28 17:04:56 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
logjam: Don't add -Lx11prefix/lib unless we really need to.

Modified Paths:
--------------
    trunk/dports/net/logjam/Portfile

Modified: trunk/dports/net/logjam/Portfile
===================================================================
--- trunk/dports/net/logjam/Portfile	2009-03-01 01:03:12 UTC (rev 47562)
+++ trunk/dports/net/logjam/Portfile	2009-03-01 01:04:56 UTC (rev 47563)
@@ -17,10 +17,18 @@
 depends_lib	lib:libgtk.2:gtk2 lib:libcurl.2:curl \
 		path:lib/libxml2.2.dylib:libxml2
 
-configure.ldflags-append	"-L${x11prefix}/lib -bind_at_load"
 configure.cppflags-append	"-no-cpp-precomp"
-configure.env	LIBS="-L${prefix}/lib -L${x11prefix}/lib -lX11"
 
+pre-configure {
+    if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+        configure.env LIBS="-L${prefix}/lib -lX11"
+        configure.ldflags-append "-L${prefix}/lib -bind_at_load"
+    } else {
+        configure.env LIBS="-L${prefix}/lib -L${x11prefix}/lib -lX11"
+        configure.ldflags-append "-L${x11prefix}/lib -bind_at_load"
+    }
+}
+
 configure.args	--without-gtkspell --without-xmms --without-gtkhtml \
 		--without-librsvg --mandir=${prefix}/share/man
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/cbbb704f/attachment.html>


More information about the macports-changes mailing list