[Qemacs-commit] Changes to qemacs/configure

[Charlie Gordon]

Index: qemacs/configure
diff -u qemacs/configure:1.6 qemacs/configure:1.7
--- qemacs/configure:1.6        Thu Apr 20 15:58:06 2006
+++ qemacs/configure    Mon Apr 24 11:58:17 2006
@@ -2,6 +2,7 @@
 #
 # qemacs configure script (c) 2002 Fabrice Bellard
 #
+
 # set temporary file name
 if test ! -z "$TMPDIR" ; then
     TMPDIR1="${TMPDIR}"
@@ -28,16 +29,16 @@
 case "$cpu" in
   i386|i486|i586|i686|i86pc|BePC)
     cpu="x86"
-  ;;
+    ;;
   armv4l)
     cpu="armv4l"
-  ;;
+    ;;
   alpha)
     cpu="alpha"
-  ;;
+    ;;
   *)
     cpu="unknown"
-  ;;
+    ;;
 esac
 gprof="no"
 network="yes"
@@ -73,8 +74,9 @@
         extralibs="-lbind -lsocket"
     else
         echo "Not sure building for net_server will succeed... good luck."
-    extralibs="-lsocket"
-    fi ;;
+        extralibs="-lsocket"
+    fi
+    ;;
   BSD/OS)
     extralibs="-lpoll -lgnugetopt -lm"
     make="gmake"
@@ -82,7 +84,8 @@
   CYGWIN*)
     cygwin="yes"
     ;;
-  *) ;;
+  *)
+    ;;
 esac
 
 # find source path
@@ -114,58 +117,83 @@
 fi
 
 for opt do
-  case "$opt" in
-  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
-  ;;
-  --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
-  ;;
-  --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2`
-  ;;
-  --cc=*) cc=`echo $opt | cut -d '=' -f 2`
-  ;;
-  --make=*) make=`echo $opt | cut -d '=' -f 2`
-  ;;
-  --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
-  ;;
-  --extra-ldflags=*) LDFLAGS="${opt#--extra-ldflags=}"
-  ;;
-  --extra-libs=*) extralibs=${opt#--extra-libs=}
-  ;;
-  --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
-  ;;
-  --enable-gprof) gprof="yes"
-  ;;
-  --disable-network) network="no"
-  ;;
-  --enable-win32) win32="yes"
-  ;;
-  --enable-cygwin) cygwin="yes" ;
-  ;;
-  --enable-shared) lshared="yes"
-  ;;
-  --disable-mpegaudio-hp) mpegaudio_hp="no"
-  ;;
-  --enable-tiny) tiny="yes"
-  ;;
-  --disable-x11) x11="no"
-  ;;
-  --disable-xv) xv="no"
-  ;;
-  --disable-xrender) xrender="no"
-  ;;
-  --disable-png) png="no"
-  ;;
-  --disable-html) html="no"
-  ;;
-  --disable-plugins) plugins="no"
-  ;;
-  --disable-ffmpeg) ffmpeg="no"
-  ;;
-  --with-ffmpegdir=*)  ffmpeg_srcdir=${opt#--with-ffmpegdir=} ; ffmpeg="yes"
-  ;;
-  --with-ffmpeglibdir=*)  ffmpeg_libdir=${opt#--with-ffmpeglibdir=}
-  ;;
-  esac
+    case "$opt" in
+      --prefix=*)
+        prefix=`echo $opt | cut -d '=' -f 2`
+        ;;
+      --source-path=*)
+        source_path=`echo $opt | cut -d '=' -f 2`
+        ;;
+      --cross-prefix=*)
+        cross_prefix=`echo $opt | cut -d '=' -f 2`
+        ;;
+      --cc=*)
+        cc=`echo $opt | cut -d '=' -f 2`
+        ;;
+      --make=*)
+        make=`echo $opt | cut -d '=' -f 2`
+        ;;
+      --extra-cflags=*)
+        CFLAGS="${opt#--extra-cflags=}"
+        ;;
+      --extra-ldflags=*)
+        LDFLAGS="${opt#--extra-ldflags=}"
+        ;;
+      --extra-libs=*)
+        extralibs=${opt#--extra-libs=}
+        ;;
+      --cpu=*)
+        cpu=`echo $opt | cut -d '=' -f 2`
+        ;;
+      --enable-gprof)
+        gprof="yes"
+        ;;
+      --disable-network)
+        network="no"
+        ;;
+      --enable-win32)
+        win32="yes"
+        ;;
+      --enable-cygwin)
+        cygwin="yes" ;
+        ;;
+      --enable-shared)
+        lshared="yes"
+        ;;
+      --disable-mpegaudio-hp)
+        mpegaudio_hp="no"
+        ;;
+      --enable-tiny)
+        tiny="yes"
+        ;;
+      --disable-x11)
+        x11="no"
+        ;;
+      --disable-xv)
+        xv="no"
+        ;;
+      --disable-xrender)
+        xrender="no"
+        ;;
+      --disable-png)
+        png="no"
+        ;;
+      --disable-html)
+        html="no"
+        ;;
+      --disable-plugins)
+        plugins="no"
+        ;;
+      --disable-ffmpeg)
+        ffmpeg="no"
+        ;;
+      --with-ffmpegdir=*)
+        ffmpeg_srcdir=${opt#--with-ffmpegdir=} ; ffmpeg="yes"
+        ;;
+      --with-ffmpeglibdir=*)
+        ffmpeg_libdir=${opt#--with-ffmpeglibdir=}
+        ;;
+    esac
 done
 
 # Checking for CFLAGS
@@ -263,16 +291,17 @@
 
 gcc_major="2"
 if $cc -o $TMPO $TMPC 2> /dev/null ; then
-   gcc_major="3"
+    gcc_major="3"
 fi
 
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
-cat << EOF
+    cat << EOF
 
 Usage: configure [options]
 Options: [defaults in brackets after descriptions]
 
 EOF
+
 echo "Standard options:"
 echo "  --help                   print this message"
 echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
@@ -296,7 +325,7 @@
 echo "  --make=MAKE              use specified make [$make]"
 echo "  --with-ffmpeglibdir=DIR  set ffmpeg object files directory"
 echo ""
-echo "NOTE: The object files are build at the place where configure is 
launched"
+echo "NOTE: The object files are built at the place where configure is 
launched"
 exit 1
 fi
 
@@ -429,7 +458,7 @@
     DIRS="tests"
     FILES="Makefile tests/Makefile"
     for dir in $DIRS ; do
-            mkdir -p $dir
+        mkdir -p $dir
     done
     for f in $FILES ; do
         ln -sf $source_path/$f $f