Changeset 4719 in vbox for trunk/configure

Timestamp:

Sep 12, 2007 9:04:14 AM (18 years ago)

Author:

vboxsync

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

24394

Message:

configure: fixed bashism

File:

• trunk/configure (modified) (7 diffs)

trunk/configure

@@ -514 +514 @@
 }
 EOF
-    if test_compile "$LIBXALAN $LIBPTHREAD ${INCXALAN:+-I$INCXALAN}" xalan xalanc; then
+    [ -n "$INCXALAN" ] && I_INCXALAN="-I$INCXALAN"
+    if test_compile "$LIBXALAN $LIBPTHREAD $I_INCXALAN" xalan xalanc; then
       if test_execute; then
         cnf_append "SDK_VBOX_XALAN_LIBS" "`strip_l "$LIBXALAN"`"
@@ -551 +552 @@
 }
 EOF
-    if test_compile "$LIBXERCES $LIBPTHREAD ${INCXERCES:+-I$INCXERCES}" xerces xercesc; then
+    [ -n "$INCXERCES" ] && I_INCXERCES="-I$INCXERCES"
+    if test_compile "$LIBXERCES $LIBPTHREAD $I_INCXERCES" xerces xercesc; then
       if test_execute; then
         cnf_append "SDK_VBOX_XERCES_LIBS" "`strip_l "$LIBXERCES"`"
@@ -678 +680 @@
 }
 EOF
-  if test_compile "$LIBZ ${INCZ:+-I$INCZ}" zlib zlib; then
+  [ -n "$INCZ" ] && I_INCZ="-I$INCZ"
+  if test_compile "$LIBZ $I_INCZ" zlib zlib; then
     if test_execute; then
       cnf_append "SDK_VBOX_ZLIB_LIBS" "`strip_l "$LIBZ"`"
@@ -707 +710 @@
 }
 EOF
-#  if test_compile "$LIBPNG ${INCPNG:+-I$INCPNG}" libpng libpng nofatal; then
-  if test_compile "$LIBPNG ${INCPNG:+-I$INCPNG}" libpng libpng; then
+  [ -n "$INCPNG" ] && I_INCPNG="-I$INCPNG"
+#  if test_compile "$LIBPNG $I_INCPNG" libpng libpng nofatal; then
+  if test_compile "$LIBPNG $I_INCPNG" libpng libpng; then
 #    if test_execute nofatal; then
     if test_execute; then
@@ -803 +807 @@
 }
 EOF
-    if test_compile "$LIBSDL $LIBSDLMAIN ${INCSDL:+-I$INCSDL}" SDL SDL; then
+    [ -n "$INCSDL" ] && I_INCSDL="-I$INCSDL"
+    if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL" SDL SDL; then
       if test_execute; then
         cnf_append "LIB_SDK_LIBSDL_SDL"     "`strip_l "$LIBSDL"`"
@@ -1224 +1229 @@
       ;;
     --odir=*)
-      ODIR=`echo $option | cut -d'=' -f2`
+      ODIR="`echo $option | cut -d'=' -f2`/"
       ;;
     *)
@@ -1235 +1240 @@
 done
 
-LOG="${ODIR:+$ODIR/}$LOG"
-ENV="${ODIR:+$ODIR/}$ENV"
-CNF="${ODIR:+$ODIR/}$CNF"
+LOG="$ODIR$LOG"
+ENV="$ODIR$ENV"
+CNF="$ODIR$CNF"
 
 # initialize output files