Fix MS-DOS configury.

[gnu-emacs] / configure

diff --git a/configure b/configure
index a6b4c45f329a127fa78a3009de775e7c4c0fc916..e89b7411ce65d2a508da774848fa25ebebe324b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -825,6 +825,7 @@ enable_asserts
 enable_maintainer_mode
 enable_locallisppath
 enable_checking
+enable_use_lisp_union_type
 enable_profiling
 enable_autodepend
 enable_largefile
@@ -1477,6 +1478,10 @@ Optional Features:
                           only specific categories of checks. Categories are:
                           all,yes,no. Flags are: stringbytes, stringoverrun,
                           stringfreelist, xmallocoverrun, conslist
+  --enable-use-lisp-union-type
+                          use a union for the Lisp_Object data type. This is
+                          only useful for development for catching certain
+                          types of bugs.
   --enable-profiling      build emacs with profiling support. This might not
                           work on all platforms
   --enable-autodepend     automatically generate dependencies to .h-files.
@@ -2978,6 +2983,17 @@ $as_echo "#define GC_CHECK_CONS_LIST 1" >>confdefs.h
 
 fi
 
+# Check whether --enable-use-lisp-union-type was given.
+if test "${enable_use_lisp_union_type+set}" = set; then :
+  enableval=$enable_use_lisp_union_type; if test "${enableval}" != "no"; then
+
+$as_echo "#define USE_LISP_UNION_TYPE 1" >>confdefs.h
+
+fi
+fi
+
+
+
 # Check whether --enable-profiling was given.
 if test "${enable_profiling+set}" = set; then :
   enableval=$enable_profiling; ac_enable_profiling="${enableval}"
@@ -4290,7 +4306,7 @@ if test x$GCC = xyes; then
   C_OPTIMIZE_SWITCH=-O2
   test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS"
 else
-    C_OPTIMIZE_SWITCH=-O
+  C_OPTIMIZE_SWITCH=-O
   test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
 fi
 
@@ -5393,12 +5409,12 @@ fi
 
 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
 then
-    ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
+  ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
 fi
 
 if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
 then
-    ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
+  ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
 fi
 
 
@@ -5436,21 +5452,18 @@ CPP=`eval "echo $CPP"`
 
 ### First figure out CFLAGS (which we use for running the compiler here)
 ### and REAL_CFLAGS (which we use for real compilation).
-### The two are the same except on a few systems, where they are made
-### different to work around various lossages.  For example,
-### GCC 2.5 on GNU/Linux needs them to be different because it treats -g
-### as implying static linking.
+### The two are the same except when using GCC where we might use
+### extra warning and profiling flags.
 
 ### If the CFLAGS env var is specified, we use that value
 ### instead of the default.
 
 if test "x$SPECIFIED_CFLAGS" = x; then
+  CFLAGS="-g $C_OPTIMIZE_SWITCH"
   if test x$GCC = xyes; then
-    CFLAGS="-g $C_OPTIMIZE_SWITCH"
     REAL_CFLAGS="$CFLAGS $C_WARNINGS_SWITCH $PROFILING_CFLAGS"
   else
-    CFLAGS=
-    REAL_CFLAGS=
+    REAL_CFLAGS="$CFLAGS"
   fi
 else
   REAL_CFLAGS="$CFLAGS"