From 97204ec4d120afbfb8fa33ccc406ed337d4bab58 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 13 Dec 2011 11:06:44 +0400
Subject: [PATCH] Fix use of enable_gc_debug in configure (DG/UX on AViiON)

* configure.ac (ac_is_dgux): Move down to below gc-debug processing
(DG/UX) since it uses "enable_gc_debug" variable; remove FIXME.
---
 configure.ac | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index dbb68602..417a0828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,27 +534,6 @@ AC_SUBST(addlibs)
 
 AC_PROG_LIBTOOL
 
-#
-# Check for AViiON Machines running DGUX
-# FIXME: Should this be moved down to below the gc-debug processing?
-#
-ac_is_dgux=no
-AC_CHECK_HEADER(sys/dg_sys_info.h,
-[ac_is_dgux=yes;])
-
-    ## :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
-    AC_SUBST(CFLAGS)
-    AC_SUBST(CXXFLAGS)
-fi
-
 dnl We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,
 [  --with-target-subdir=SUBDIR
@@ -663,6 +642,24 @@ AC_ARG_ENABLE(gc-debug,
   fi)
 AM_CONDITIONAL([KEEP_BACK_PTRS], [test x"$keep_back_ptrs" = xtrue])
 
+# Check for AViiON Machines running DGUX
+ac_is_dgux=no
+AC_CHECK_HEADER(sys/dg_sys_info.h,
+[ac_is_dgux=yes;])
+
+    ## :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
+    AC_SUBST(CFLAGS)
+    AC_SUBST(CXXFLAGS)
+fi
+
 AC_ARG_ENABLE(java-finalization,
     [AC_HELP_STRING([--disable-java-finalization],
         [Disable support for java finalization.])])
-- 
2.40.0