Regenerate configure; update ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b6da6990eddc4613a6c9be8e2a090517d8ad11cc..c817f3dd8a00cfd90172cfc05c54be8b9da9f2e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-12-13  Ivan Maidanski <ivmai@mail.ru>
+
+       * configure: Regenerate.
+
+2011-12-13  Ivan Maidanski <ivmai@mail.ru>
+
+       * configure.ac (ac_is_dgux): Move down to below gc-debug processing
+       (DG/UX) since it uses "enable_gc_debug" variable; remove FIXME.
+
+2011-12-13  Ivan Maidanski <ivmai@mail.ru>
+
+       * configure.ac (CFLAGS, CXXFLAGS): Preserve C/C++ flags passed by
+       client (DG/UX only); remove code duplication (put common flags to
+       "dgux_spec_opts" variable).
+
 2011-11-23  Ivan Maidanski <ivmai@mail.ru>  (really Bruce Mitchener)
 
        * README: Fix typos.

diff --git a/configure b/configure
index 94f28f54183eeeeba31cdeca6893f140b15dd354..fc799aff9993d11012e43e46c26fb47f278980af 100755 (executable)
--- a/configure
+++ b/configure
@@ -16113,31 +16113,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-#
-# Check for AViiON Machines running DGUX
-# FIXME: Should this be moved down to below the gc-debug processing?
-#
-ac_is_dgux=no
-ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then :
-  ac_is_dgux=yes;
-fi
-
-
-
-    ## :GOTCHA: we do not check anything but sys/dg_sys_info.h
-if test $ac_is_dgux = yes; then
-    if test "$enable_gc_debug" = "yes"; then
-      CFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-      CXXFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-    else
-      CFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-      CXXFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-    fi
-
-
-fi
-
 
 # Check whether --with-target-subdir was given.
 if test "${with_target_subdir+set}" = set; then :
@@ -16311,6 +16286,28 @@ else
 fi
 
 
+# Check for AViiON Machines running DGUX
+ac_is_dgux=no
+ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then :
+  ac_is_dgux=yes;
+fi
+
+
+
+    ## :GOTCHA: we do not check anything but sys/dg_sys_info.h
+if test $ac_is_dgux = yes; then
+    dgux_spec_opts="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
+    CFLAGS="$dgux_spec_opts $CFLAGS"
+    CXXFLAGS="$dgux_spec_opts $CXXFLAGS"
+    if test "$enable_gc_debug" = "yes"; then
+      CFLAGS="-g -mstandard $CFLAGS"
+      CXXFLAGS="-g -mstandard $CXXFLAGS"
+    fi
+
+
+fi
+
 # Check whether --enable-java-finalization was given.
 if test "${enable_java_finalization+set}" = set; then :
   enableval=$enable_java_finalization;