Changeset 2926 in vbox for trunk

Timestamp:

May 30, 2007 7:48:19 AM (18 years ago)

Author:

vboxsync

Message:

introduced LIB_HAL_LIBPATH for rhel5

Location:

trunk

Files:

• configure (modified) (17 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)

trunk/configure

@@ -56 +56 @@
 LIBPNG="-lpng"
 CFLAGSHAL="-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
+LIBPATHHAL=""
 LIBHAL="-lhal -ldbus-1"
 QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3"
@@ -445 +446 @@
     if test_compile "$LIBXALAN ${INCXALAN:+-I$INCXALAN}" xalan xalanc; then
       if test_execute; then
-        cnf_append "SDK_VBOX_XALAN_LIBS" `echo $LIBXALAN|sed 's+-l++'`
+        cnf_append "SDK_VBOX_XALAN_LIBS" "`echo $LIBXALAN|sed 's+-l++'`"
         cnf_append "SDK_VBOX_XALAN_INCS" "$INCXALAN"
       fi
@@ -480 +481 @@
     if test_compile "$LIBXERCES ${INCXERCES:+-I$INCXERCES}" xerces xercesc; then
       if test_execute; then
-        cnf_append "SDK_VBOX_XERCES_LIBS" `echo $LIBXERCES|sed 's+-l++'`
+        cnf_append "SDK_VBOX_XERCES_LIBS" "`echo $LIBXERCES|sed 's+-l++'`"
         cnf_append "SDK_VBOX_XERCES_INCS" "$INCXERCES"
       fi
@@ -514 +515 @@
     else
       log_success "found version $libidl_ver"
-      cnf_append "VBOX_LIBIDL_CONFIG" `which_wrapper libIDL-config`
+      cnf_append "VBOX_LIBIDL_CONFIG" "`which_wrapper libIDL-config`"
     fi
   fi
@@ -543 +544 @@
     if test_execute nofatal; then
       cnf_append "SDK_VBOX_OPENSSL_INCS" ""
-      cnf_append "SDK_VBOX_OPENSSL_LIBS" `echo $LIBCRYPTO|sed 's+-l++'`
+      cnf_append "SDK_VBOX_OPENSSL_LIBS" "`echo $LIBCRYPTO|sed 's+-l++'`"
     fi
   fi
@@ -577 +578 @@
   if test_compile $LIBPTHREAD pthread pthread; then
     if test_execute; then
-      cnf_append "LIB_PTHREAD" `echo $LIBPTHREAD|sed 's+-l++'`
+      cnf_append "LIB_PTHREAD" "`echo $LIBPTHREAD|sed 's+-l++'`"
     fi
   fi
@@ -605 +606 @@
   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++'`
+      cnf_append "SDK_VBOX_ZLIB_LIBS" "`echo $LIBZ|sed 's+-l++'`"
       cnf_append "SDK_VBOX_ZLIB_INCS" "$INCZ"
     fi
@@ -634 +635 @@
   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++'`
+      cnf_append "SDK_VBOX_LIBPNG_LIBS" "`echo $LIBPNG|sed 's+-l++'`"
       cnf_append "SDK_VBOX_LIBPNG_INCS" "$INCPNG"
     fi
@@ -722 +723 @@
   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++'`
-      cnf_append "LIB_SDK_LIBSDL_SDLMAIN" `echo $LIBSDLMAIN|sed 's+-l++'`
+      cnf_append "LIB_SDK_LIBSDL_SDL"     "`echo $LIBSDL|sed 's+-l++'`"
+      cnf_append "LIB_SDK_LIBSDL_SDLMAIN" "`echo $LIBSDLMAIN|sed 's+-l++'`"
       [ -n "$INCSDL" ] && cnf_append "SDK_LIBSDL_INCS" "$INCSDL"
     fi
@@ -806 +807 @@
   if test_compile "$LIBX11 $LIBXCURSOR" Xcursor Xcursor; then
     log_success "found"
-    cnf_append "LIB_XCURSOR" `echo $LIBXCURSOR|sed 's+-l++'`
+    cnf_append "LIB_XCURSOR" "`echo $LIBXCURSOR|sed 's+-l++'`"
   fi
 }
@@ -875 +876 @@
       if (($?==0)); then
         if test_execute; then
-          cnf_append "QTDIR" `cd $q ; pwd`
+          cnf_append "QTDIR" "`cd $q ; pwd`"
           found_qt=1
           break
@@ -937 +938 @@
   else
     if test_execute; then
-      cnf_append "VBOX_LINUX_SRC" `cd $LINUX ; pwd`
+      cnf_append "VBOX_LINUX_SRC" "`cd $LINUX ; pwd`"
     fi
   fi
@@ -1013 +1014 @@
   test_header libhal
   pc_cflagshal=`pkg-config hal --cflags 2>/dev/null`
-  pc_libhal=`pkg-config hal --libs 2>/dev/null`
+  pc_libhal=`pkg-config hal --libs-only-l 2>/dev/null`
+  pc_libpathhal=`pkg-config hal --libs-only-L 2>/dev/null`
   pc_verhal=`pkg-config hal --modversion 2>/dev/null`
-  if [ ! -z "$pc_cflagshal" ]
-  then # is this acceptable?
-      CFLAGSHAL=$pc_cflagshal
-      LIBHAL=$pc_libhal
+  if [ ! -z "$pc_cflagshal" ]; then # is this acceptable?
+    CFLAGSHAL=$pc_cflagshal
+    LIBPATHHAL=$pc_libpathhal
+    LIBHAL=$pc_libhal
   fi
   echo '
@@ -1035 +1037 @@
 }
 ' > .tmp_src.cc
-  if test_compile "$CFLAGSHAL $LIBHAL" libhal libhal; then
+  if test_compile "$CFLAGSHAL $LIBPATHHAL $LIBHAL" libhal libhal; then
     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_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 "VBOX_WITH_LIBHAL" "1"
   fi
@@ -1226 +1229 @@
 
 # emit disable directives corresponding to any --disable-xxx options.
-(($WITH_XPCOM==0)) && cnf_append "VBOX_WITH_MAIN" ""
-(($WITH_QT==0)) && cnf_append "VBOX_WITH_QTGUI" ""
+(($WITH_XPCOM==0))   && cnf_append "VBOX_WITH_MAIN" ""
+(($WITH_QT==0))      && cnf_append "VBOX_WITH_QTGUI" ""
 (($WITH_SDL_TTF==0)) && cnf_append "VBOX_WITH_SECURELABEL" ""
 
@@ -1247 +1250 @@
 
 # the libraries
-(($WITH_XPCOM==1)) && check_xalan
-(($WITH_XPCOM==1)) && check_xerces
-(($WITH_LIBIDL==1)) && check_libidl
-(($OSE==0)) && check_ssl
+(($WITH_XPCOM==1))    && check_xalan
+(($WITH_XPCOM==1))    && check_xerces
+(($WITH_LIBIDL==1))   && check_libidl
+(($OSE==0))           && check_ssl
 [ "$OS" != "darwin" ] && check_pthread
 [ "$OS" != "darwin" ] && check_z
@@ -1260 +1263 @@
 [ "$OS" != "darwin" ] && check_x
 [ "$OS" != "darwin" ] && check_xcursor
-(($WITH_QT==1)) && check_qt
+(($WITH_QT==1))       && check_qt
 
 # Linux-specific

trunk/src/VBox/Main/Makefile.kmk

@@ -156 +156 @@
 VBoxSVC_CXXFLAGS += \
         $(LIB_HAL_CFLAGS)
+VBoxSVC_LIBPATH += \
+        $(LIB_HAL_LIBPATH)
 VBoxSVC_LIBS += \
         $(LIB_HAL_LIBS)