jhbuild r2191 - in trunk: . jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Sun Jul 27 22:08:03 2008
New Revision: 2191
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2191&view=rev

Log:
* jhbuild/config.py: add C_INCLUDE_DIR back and also set LDFLAGS, they
are required for autoconf configure scripts to find some modules that
do not use pkg-config.  (closes: #545018, #377724)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/config.py

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sun Jul 27 22:08:03 2008
@@ -145,9 +145,6 @@
             except:
                 raise FatalError(_("Can't create %s directory") % self.prefix)
 
-        #includedir = os.path.join(prefix, 'include')
-        #addpath('C_INCLUDE_PATH', includedir)
-
         # LD_LIBRARY_PATH
         if self.use_lib64:
             libdir = os.path.join(self.prefix, 'lib64')
@@ -155,6 +152,14 @@
             libdir = os.path.join(self.prefix, 'lib')
         addpath('LD_LIBRARY_PATH', libdir)
 
+        # LDFLAGS and C_INCLUDE_PATH are required for autoconf configure
+        # scripts to find modules that do not use pkg-config (such as guile
+        # looking for gmp, or wireless-tools for NetworkManager)
+        # (see bug #377724 and bug #545018)
+        os.environ['LDFLAGS'] = ('-L%s ' % libdir) + os.environ.get('LDFLAGS', '')
+        includedir = os.path.join(self.prefix, 'include')
+        addpath('C_INCLUDE_PATH', includedir)
+
         # On Mac OS X, we use DYLD_FALLBACK_LIBRARY_PATH
         addpath('DYLD_FALLBACK_LIBRARY_PATH', libdir)