Changeset 4723:e4a0ba316600 in roaraudio

Timestamp:

01/18/11 23:31:05 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to test_func_defmake to link additional libs. This was needed for testing getobjectbyname() because it requires linking libdnet.

File:

• configure (modified) (4 diffs)

configure

@@ -785 +785 @@
  CALL="$1"
  shift;
+
+ LIBS=''
+
+ while [ "$1" != '--' ]
+ do
+  case "$1" in
+   'c'|'-lc')
+    :; # no need to do anything
+   ;;
+   '-'*)
+    LIBS="$LIBS $1"
+   ;;
+   *)
+    LIBS="-l$1"
+   ;;
+  esac
+  shift;
+ done
+
  shift; # skip '--'
 
@@ -792 +811 @@
   while [ "$1" != '' ]
   do
-   echo "#include <$1>"
-   shift;
+   _h="$1";
+   shift;
+   _envname=`echo "$_h" | to_escaped`
+   eval "_t=\$libname_$_envname"
+   echo "LIB($name) DEPENDS ON $_h($_envname) with state '$_t'" >&5
+   if [ "$_t" = 'false' ]
+   then
+    echo "// not including <$_h> as it was tested as not present"
+   else
+    echo "#include <$_h>"
+   fi
   done
 
@@ -809 +837 @@
  echo "FUNCTION($NAME) HAS COMPILER/LINKER OUTPUT:" >&5
  echo "--- BEGIN OF CHILD OUTPUT BLOCK ---" >&5
- $CCTF >&5 2>&5;
+ $CCTF $LIBS >&5 2>&5;
  R=$?
  echo "--- END OF CHILD OUTPUT BLOCK ---" >&5
@@ -1762 +1790 @@
 fi
 
-test_func_defmake ROAR_HAVE_GETOBJECTBYNAME getobjectbyname 'getobjectbyname(NULL)' -- stdlib.h netdnet/dn.h netdnet/dnetdb.h
+test_func_defmake ROAR_HAVE_GETOBJECTBYNAME getobjectbyname 'getobjectbyname(NULL)' dnet -- stdlib.h netdnet/dn.h netdnet/dnetdb.h
 test_func_defmake ROAR_HAVE_GETSERVBYNAME   getservbyname   'getservbyname((void*)0, (void*)0)' -- netdb.h