Changeset 725:a072974497c7 in roaraudio

Timestamp:

09/02/08 17:44:05 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use pkg-config if we have one

File:

• configure (modified) (6 diffs)

configure

@@ -19 +19 @@
 SYSNAME='unknown'
 SHARED='-shared'
+PKG_CONFIG=false
 
 echo -n "checking for C compiler... "
@@ -28 +29 @@
 fi
 echo $CC
+
+echo -n "checking for pkg-config... "
+PKG_CONFIG=$(which pkg-config false 2> /dev/null | head -n 1)
+if $PKG_CONFIG --help > /dev/null 2> /dev/null
+then
+ echo $PKG_CONFIG
+else
+ echo no
+fi
 
 #Makefile.conf not yet open, write it later
@@ -87 +97 @@
  shift;
 
+ LIBS=$(echo "$LIBS" | sed 's/-l-l/-l/g')
+
  while [ "$1" != '' ]
  do
@@ -114 +126 @@
  shift
  shift
+ name="$1"
  lib="$2"
+ shift
 
  [ "$subdir" = '%' ] && subdir=''
@@ -132 +146 @@
  fi
 
- if test_lib $@
+ LIBS=$($PKG_CONFIG --silence-errors --libs $lib)
+ if [ "$?" != '0' ]
+ then
+  LIBS="-l$lib"
+ fi
+
+ if test_lib "$name" $LIBS "$@"
  then
   echo "#define $def"            >&3
   [ "$subdir" != '' ] && \
    echo "subdir_$subdir=$subdir" >&4
-  echo "lib_$lib=-l$lib" >&4
+  echo "lib_$lib=$LIBS" >&4
  else
   [ "$subdir" != '' ] && \
@@ -207 +227 @@
 test_lib_defmake ROAR_HAVE_LIBARTSC      libroararts  libartsc      artsc      -- kde/artsc/artsc.h
 test_lib_defmake ROAR_HAVE_LIBDNET       %            libdnet       dnet       -- sys/socket.h netdnet/dn.h netdnet/dnetdb.h
-test_lib_defmake ROAR_HAVE_IPX           %            IPX                      -- netipx/ipx.h
+test_lib_defmake ROAR_HAVE_IPX           %            IPX           c          -- netipx/ipx.h
 
 # add a better test here