Changeset 3032 in vbox

Timestamp:

Jun 4, 2007 2:27:11 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21786

Message:

make sure we don't strip -l if inside a library name

File:

• trunk/configure (modified) (10 diffs)

trunk/configure

@@ -111 +111 @@
 }
 
+function strip_l()
+{
+  echo "$1"|sed 's|-l\([^ ]\+\)|\1|g'
+}
+
+function strip_L()
+{
+  echo "$1"|sed 's|-L\([^ ]\+\)|\1|g'
+}
+
 # Wrapper for ancient /usr/bin/which on darwin that always returns 0
 function which_wrapper()
@@ -446 +456 @@
     if test_compile "$LIBXALAN $LIBPTHREAD ${INCXALAN:+-I$INCXALAN}" xalan xalanc; then
       if test_execute; then
-        cnf_append "SDK_VBOX_XALAN_LIBS" "`echo $LIBXALAN|sed 's+-l++g'`"
+        cnf_append "SDK_VBOX_XALAN_LIBS" "`strip_l $LIBXALAN`"
         cnf_append "SDK_VBOX_XALAN_INCS" "$INCXALAN"
       fi
@@ -481 +491 @@
     if test_compile "$LIBXERCES $LIBPTHREAD ${INCXERCES:+-I$INCXERCES}" xerces xercesc; then
       if test_execute; then
-        cnf_append "SDK_VBOX_XERCES_LIBS" "`echo $LIBXERCES|sed 's+-l++g'`"
+        cnf_append "SDK_VBOX_XERCES_LIBS" "`strip_l $LIBXERCES`"
         cnf_append "SDK_VBOX_XERCES_INCS" "$INCXERCES"
       fi
@@ -544 +554 @@
     if test_execute nofatal; then
       cnf_append "SDK_VBOX_OPENSSL_INCS" ""
-      cnf_append "SDK_VBOX_OPENSSL_LIBS" "`echo $LIBCRYPTO|sed 's+-l++g'`"
+      cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l $LIBCRYPTO`"
     fi
   fi
@@ -578 +588 @@
   if test_compile $LIBPTHREAD pthread pthread; then
     if test_execute; then
-      cnf_append "LIB_PTHREAD" "`echo $LIBPTHREAD|sed 's+-l++g'`"
+      cnf_append "LIB_PTHREAD" "`strip_l $LIBPTHREAD`"
     fi
   fi
@@ -606 +616 @@
   if test_compile "$LIBZ ${INCZ:+-I$INCZ}" zlib zlib; then
     if test_execute; then
-      cnf_append "SDK_VBOX_ZLIB_LIBS" "`echo $LIBZ|sed 's+-l++g'`"
+      cnf_append "SDK_VBOX_ZLIB_LIBS" "`strip_l $LIBZ`"
       cnf_append "SDK_VBOX_ZLIB_INCS" "$INCZ"
     fi
@@ -635 +645 @@
   if test_compile "$LIBPNG ${INCPNG:+-I$INCPNG}" libpng libpng nofatal; then
     if test_execute nofatal; then
-      cnf_append "SDK_VBOX_LIBPNG_LIBS" "`echo $LIBPNG|sed 's+-l++g'`"
+      cnf_append "SDK_VBOX_LIBPNG_LIBS" "`strip_l $LIBPNG`"
       cnf_append "SDK_VBOX_LIBPNG_INCS" "$INCPNG"
     fi
@@ -723 +733 @@
   if test_compile "$LIBSDL $LIBSDLMAIN ${INCSDL:+-I$INCSDL}" SDL SDL; then
     if test_execute; then
-      cnf_append "LIB_SDK_LIBSDL_SDL"     "`echo $LIBSDL|sed 's+-l++g'`"
-      cnf_append "LIB_SDK_LIBSDL_SDLMAIN" "`echo $LIBSDLMAIN|sed 's+-l++g'`"
+      cnf_append "LIB_SDK_LIBSDL_SDL"     "`strip_l $LIBSDL`"
+      cnf_append "LIB_SDK_LIBSDL_SDLMAIN" "`strip_l $LIBSDLMAIN`"
       [ -n "$INCSDL" ] && cnf_append "SDK_LIBSDL_INCS" "$INCSDL"
     fi
@@ -807 +817 @@
   if test_compile "$LIBX11 $LIBXCURSOR" Xcursor Xcursor; then
     log_success "found"
-    cnf_append "LIB_XCURSOR" "`echo $LIBXCURSOR|sed 's+-l++g'`"
+    cnf_append "LIB_XCURSOR" "`strip_l $LIBXCURSOR`"
   fi
 }
@@ -1040 +1050 @@
     log_success "found version $pc_verhal"
     cnf_append "LIB_HAL_CFLAGS"   "$CFLAGSHAL"
-    cnf_append "LIB_HAL_LIBS"     "`echo $LIBHAL | sed 's+-l++g'`"
-    cnf_append "LIB_HAL_LIBPATH"  "`echo $LIBPATHHAL | sed 's+-L++g'`"
+    cnf_append "LIB_HAL_LIBS"     "`strip_l $LIBHAL`"
+    cnf_append "LIB_HAL_LIBPATH"  "`strip_L $LIBPATHHAL`"
     cnf_append "VBOX_WITH_LIBHAL" "1"
   fi