[gtkglext] Move AC_ARG_* (and related conclusions) to the bottom of the file. The general pattern is: we do th



commit 35cf8d12fb9d76df0edb1c94e497d7762ef83061
Author: Braden McDaniel <bmcdaniel turketron tena-sda org>
Date:   Thu Dec 17 16:58:50 2009 -0500

    Move AC_ARG_* (and related conclusions) to the bottom of the file.  The general pattern is: we do the tests first, then derive conclusions for the configuration.

 configure.ac |  134 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 68 insertions(+), 66 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c02cd46..3a6f859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,54 +138,6 @@ AC_SUBST([MATH_LIB])
 
 AM_CONDITIONAL([MS_LIB_AVAILABLE], [test "x$ms_librarian" = "xyes"])
 
-if test "x$platform_win32" = "xyes"; then
-  gdktarget=win32
-else
-  gdktarget=x11
-fi
-
-AC_ARG_WITH([gdktarget],
-            [AS_HELP_STRING([--with-gdktarget=@<:@x11/win32@:>@],
-                            [select GDK target])],
-            [gdktarget=$with_gdktarget])
-
-AC_SUBST([gdktarget])
-case $gdktarget in
-  x11|win32) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11 or win32.]);;
-esac
-
-gdkglext_targetlib=libgdkglext-$gdktarget-$GTKGLEXT_API_VERSION.la
-gtkglext_targetlib=libgtkglext-$gdktarget-$GTKGLEXT_API_VERSION.la
-
-AC_SUBST([gdkglext_targetlib])
-AC_SUBST([gtkglext_targetlib])
-
-# Debug option
-AC_ARG_ENABLE([debug],
-              AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
-                             [turn on debugging @<:@default=gtkglext_debug_default@:>@]), ,
-              [enable_debug=gtkglext_debug_default])
-
-changequote(,)dnl
-if test "x$enable_debug" = "xyes"; then
-  if test x$cflags_set != xset ; then
-      case " $CFLAGS " in
-      *[[\ \	]]-g[[\ \	]]*) ;;
-      *) CFLAGS="$CFLAGS -g" ;;
-      esac
-  fi
-  GTKGLEXT_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
-else
-  if test "x$enable_debug" = "xno"; then
-    GTKGLEXT_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
-  else
-    GTKGLEXT_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
-  fi
-fi
-changequote([,])dnl
-
-AC_SUBST([GTKGLEXT_DEBUG_FLAGS])
 
 # Platform-specific compiler options
 case "$host_os" in
@@ -244,24 +196,6 @@ else
 fi
 AC_SUBST([LIBTOOL_EXPORT_OPTIONS])
 
-# define a MAINT-like variable REBUILD which is set if Perl
-# and awk are found, so autogenerated sources can be rebuilt
-
-AC_ARG_ENABLE([rebuilds],
-              [AS_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])], ,
-              [enable_rebuilds=yes])
-
-AC_PATH_PROGS([PERL], [perl5 perl])
-
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
-     test -n "$PERL" && \
-     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
-  REBUILD=
-fi
-AC_SUBST([REBUILD])
-
 # Checks for headers and libraries.
 
 AC_CHECK_HEADERS([inttypes.h stdlib.h string.h])
@@ -681,6 +615,74 @@ LIBS="$save_LIBS"
 
 GTK_DOC_CHECK
 
+
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
+
+AC_ARG_ENABLE([rebuilds],
+              [AS_HELP_STRING([--disable-rebuilds],
+                              [disable all source autogeneration rules])], ,
+              [enable_rebuilds=yes])
+
+AC_PATH_PROGS([PERL], [perl5 perl])
+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
+  REBUILD=
+fi
+AC_SUBST([REBUILD])
+
+if test "x$platform_win32" = "xyes"; then
+  gdktarget=win32
+else
+  gdktarget=x11
+fi
+
+AC_ARG_WITH([gdktarget],
+            [AS_HELP_STRING([--with-gdktarget=@<:@x11/win32@:>@],
+                            [select GDK target])],
+            [gdktarget=$with_gdktarget])
+
+AC_SUBST([gdktarget])
+case $gdktarget in
+  x11|win32) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11 or win32.]);;
+esac
+
+gdkglext_targetlib=libgdkglext-$gdktarget-$GTKGLEXT_API_VERSION.la
+gtkglext_targetlib=libgtkglext-$gdktarget-$GTKGLEXT_API_VERSION.la
+
+AC_SUBST([gdkglext_targetlib])
+AC_SUBST([gtkglext_targetlib])
+
+# Debug option
+AC_ARG_ENABLE([debug],
+              AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
+                             [turn on debugging @<:@default=gtkglext_debug_default@:>@]), ,
+              [enable_debug=gtkglext_debug_default])
+
+changequote(,)dnl
+if test "x$enable_debug" = "xyes"; then
+  if test x$cflags_set != xset ; then
+      case " $CFLAGS " in
+      *[[\ \	]]-g[[\ \	]]*) ;;
+      *) CFLAGS="$CFLAGS -g" ;;
+      esac
+  fi
+  GTKGLEXT_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
+else
+  if test "x$enable_debug" = "xno"; then
+    GTKGLEXT_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
+  else
+    GTKGLEXT_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
+  fi
+fi
+changequote([,])dnl
+
+AC_SUBST([GTKGLEXT_DEBUG_FLAGS])
+
 ##################################################
 # Output configuration header
 ##################################################



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]