[Qemu-devel] Patch to make configure /bin/sh compatible

[Ben Taylor]

This is a patch to make configure truly /bin/sh compatible,
as well as changing some logic to remove "echo -n" for
output to files, as "echo -n" is not consistent among
environments.

This is against the latest cvs branch, and I appreciate
any feedback.

Ben

--- configure.ORIG      2006-04-14 10:26:38.028745000 -0400
+++ configure   2006-04-14 11:47:28.766258000 -0400
@@ -133,7 +133,7 @@
 esac
 
 if [ "$bsd" = "yes" ] ; then
-  if [ ! "$darwin" = "yes" ] ; then
+  if [ "$darwin" != "yes" ] ; then
     make="gmake"
   fi
 fi
@@ -141,39 +141,40 @@
 # find source path
 # XXX: we assume an absolute path is given when launching configure,
 # except in './configure' case.
-source_path=${0%configure}
-source_path=${source_path%/}
+source_path=`dirname $0`
 source_path_used="yes"
 if test -z "$source_path" -o "$source_path" = "." ; then
     source_path=`pwd`
     source_path_used="no"
 fi
 
+
 for opt do
+  optarg=`expr "$opt" : '[^=]*=\(.*\)'`
   case "$opt" in
   --help|-h) show_help=yes
   ;;
-  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
+  --prefix=*) prefix="$optarg"
   ;;
-  --interp-prefix=*) interp_prefix=`echo $opt | cut -d '=' -f 2`
+  --interp-prefix=*) interp_prefix="$optarg"
   ;;
-  --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
+  --source-path=*) source_path="$optarg"
   ;;
-  --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2`
+  --cross-prefix=*) cross_prefix="$optarg"
   ;;
-  --cc=*) cc=`echo $opt | cut -d '=' -f 2`
+  --cc=*) cc="$optarg"
   ;;
-  --host-cc=*) host_cc=`echo $opt | cut -d '=' -f 2`
+  --host-cc=*) host_cc="$optarg"
   ;;
-  --make=*) make=`echo $opt | cut -d '=' -f 2`
+  --make=*) make="$optarg"
   ;;
-  --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
+  --extra-cflags=*) CFLAGS="$optarg"
   ;;
-  --extra-ldflags=*) LDFLAGS="${opt#--extra-ldflags=}"
+  --extra-ldflags=*) LDFLAGS="$optarg"
   ;;
-  --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
+  --cpu=*) cpu="$optarg"
   ;;
-  --target-list=*) target_list=${opt#--target-list=}
+  --target-list=*) target_list="$optarg"
   ;;
   --enable-gprof) gprof="yes"
   ;;
@@ -189,9 +190,9 @@
   ;;
   --enable-fmod) fmod="yes"
   ;;
-  --fmod-lib=*) fmod_lib=${opt#--fmod-lib=}
+  --fmod-lib=*) fmod_lib="$optarg"
   ;;
-  --fmod-inc=*) fmod_inc=${opt#--fmod-inc=}
+  --fmod-inc=*) fmod_inc="$optarg"
   ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
   ;;
@@ -203,7 +204,7 @@
   ;;
   --enable-profiler) profiler="yes"
   ;;
-  --kernel-path=*) kernel_path=${opt#--kernel-path=}
+  --kernel-path=*) kernel_path="$optarg"
   ;;
   --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
   ;;
@@ -294,7 +295,7 @@
         target_list="i386-user arm-user armeb-user sparc-user ppc-user 
mips-user mipsel-user $target_list"
     fi
 else
-    target_list=$(echo "$target_list" | sed -e 's/,/ /g')
+    target_list=`echo "$target_list" | sed -e 's/,/ /g'`
 fi
 if test -z "$target_list" ; then
     echo "No targets enabled"
@@ -348,12 +349,12 @@
 # Check for gcc4
 if test "$check_gcc" = "yes" ; then
     cat > $TMPC <<EOF
-#if __GNUC__ >= 4
+#if __GNUC__ < 4
 #error gcc4
 #endif
 int main(){return 0;}
 EOF
-    if ! $cc -o $TMPO $TMPC 2>/dev/null ; then
+    if $cc -o $TMPO $TMPC 2>/dev/null ; then
         echo "ERROR: \"$cc\" looks like gcc 4.x"
         echo "QEMU is known to have problems when compiled with gcc 4.x"
         echo "It is recommended that you use gcc 3.x to build QEMU"
@@ -460,7 +461,6 @@
 echo "CoreAudio support $coreaudio"
 echo "ALSA support      $alsa"
 echo "DSound support    $dsound"
-echo -n "FMOD support      $fmod"
 if test "$fmod" = "yes"; then
     if test -z $fmod_lib || test -z $fmod_inc; then
         echo
@@ -469,8 +469,11 @@
         echo
         exit 1
     fi
-    echo -n " (lib='$fmod_lib' include='$fmod_inc')"
+    fmod_support=" (lib='$fmod_lib' include='$fmod_inc')"
+else
+    fmod_support=""
 fi
+echo "FMOD support      $fmod $fmod_support"
 echo ""
 echo "kqemu support     $kqemu"
 
@@ -480,7 +483,6 @@
 #if test "$sdl_static" = "no"; then
 #  echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a 
graphical output"
 #fi
-
 config_mak="config-host.mak"
 config_h="config-host.h"
 
@@ -607,12 +609,12 @@
   echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
   echo "#define CONFIG_FMOD 1" >> $config_h
 fi
-echo -n "VERSION=" >>$config_mak
-head $source_path/VERSION >>$config_mak
-echo "" >>$config_mak
-echo -n "#define QEMU_VERSION \"" >> $config_h
-head $source_path/VERSION >> $config_h
-echo "\"" >> $config_h
+echo "VERSION=`head $source_path/VERSION`" >>$config_mak
+#head $source_path/VERSION >>$config_mak
+#echo "" >>$config_mak
+echo "#define QEMU_VERSION \"`head $source_path/VERSION`\"" >> $config_h
+#head $source_path/VERSION >> $config_h
+#echo "\"" >> $config_h
 
 echo "SRC_PATH=$source_path" >> $config_mak
 echo "TARGET_DIRS=$target_list" >> $config_mak
@@ -625,7 +627,6 @@
 fi
 
 for target in $target_list; do
-
 target_dir="$target"
 config_mak=$target_dir/config.mak
 config_h=$target_dir/config.h
@@ -750,16 +751,15 @@
     if test "$sdl1" = "yes" ; then
         echo "#define CONFIG_SDL 1" >> $config_h
         echo "CONFIG_SDL=yes" >> $config_mak
+        SDL_CFLAGS=" SDL_CFLAGS=`$sdl_config --cflags`"
+        if [ "${aa}" = "yes" ] ; then
+            SDL_CFLAGS="$SDL_CFLAGS `aalib-config --cflags`"
+        fi
         if test "$target_softmmu" = "no" -o "$static" = "yes"; then
-            echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
+            echo "SDL_LIBS=$sdl_static_libs $SDL_CFLAGS`" >> $config_mak
         else
-            echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
-        fi
-        echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
-        if [ "${aa}" = "yes" ] ; then
-            echo -n " `aalib-config --cflags`" >> $config_mak ;
+            echo "SDL_LIBS=`$sdl_config --libs` $SDL_CFLAGS" >> $config_mak
         fi
-        echo "" >> $config_mak
     fi
 fi