Changeset 1bf9492

Timestamp:

2008-06-09T02:18:34Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ddd4779

Parents:

12ebe74

Message:

Use system lib directories and pkg-config directory from target when specified.

Files:

• Makefile (modified) (1 diff)
• configure (modified) (4 diffs)

Makefile

@@ -14 +14 @@
 subdirs = lib protocols
 
-ifeq ($(ARCH),Windows)
+ifeq ($(TARGET),i586-mingw32msvc)
 objects += win32.o
 else

configure

@@ -20 +20 @@
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
+systemlibdirs="/lib /usr/lib /usr/local/lib"
 
 msn=1
@@ -109 +110 @@
 PCDIR=$pcdir
 
+TARGET=$target
 ARCH=$arch
 CPU=$cpu
@@ -134 +136 @@
 EOF
 
+
+
 if [ -n "$target" ]; then
-        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
+        PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
+        export PKG_CONFIG_LIBDIR
         PATH=/usr/$target/bin:$PATH
         CC=$target-cc
         LD=$target-ld
-fi
+        systemlibdirs="/usr/$target/lib"
+fi
+
 
 if [ "$debug" = "1" ]; then
@@ -343 +350 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-for i in /lib /usr/lib /usr/local/lib; do
+for i in $systemlibdirs; do
         if [ -f $i/libresolv.a ]; then
                 echo '#define HAVE_RESOLV_A' >> config.h