Fixed long-standing typo in aspect ratio computation code. (pointed out by

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 18b6e73339aa33a40aa56647eb8da50fda6b73ee..1c8f0494c021b1e7145e582a4e1362eeee770b37 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=5
+GTK_MICRO_VERSION=6
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -71,12 +71,12 @@ AC_ARG_WITH(threads, [  --with-threads=[posix] support threading ])
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  CFLAGS="$CFLAGS -DG_ENABLE_DEBUG"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
-    CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS"
+    GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS"
   else
-    CFLAGS="$CFLAGS -DGTK_NO_CHECK_CASTS"
+    GTK_DEBUG_FLAGS="-DGTK_NO_CHECK_CASTS"
   fi
 fi
 
@@ -164,7 +164,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
     AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
 
 if test "x$enable_xim" = "xyes"; then
-  CFLAGS="$CFLAGS -DUSE_XIM"
+  GTK_XIM_FLAGS="-DUSE_XIM"
 fi
 
 if test x$with_glib = xyes ; then
@@ -175,9 +175,9 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.5,,
+  AM_PATH_GLIB(1.1.6,,
     AC_MSG_ERROR([
-*** GLIB 1.1.5 or better is required. The latest version of GLIB
+*** GLIB 1.1.6 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule)
 
@@ -291,21 +291,21 @@ fi
 
 # Threads
 
-CFLAGS="$saved_cflags"
-LDFLAGS="$saved_ldflags"
-
 if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
   AC_CHECK_LIB(pthread, pthread_attr_init, 
     [AC_DEFINE(USE_PTHREADS)
     x_libs="$x_libs -lpthread"
-    CFLAGS="$CFLAGS -D_REENTRANT"],
+    GTK_THREAD_FLAGS="-D_REENTRANT"],
     # AIX has libpthreads, cause they're special. Special friends (TM)
     AC_CHECK_LIB(pthreads, pthread_attr_init,
       [AC_DEFINE(USE_PTHREADS)
       x_libs="$x_libs -lpthreads"
-      CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"]))
+      GTK_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
 fi
 
+CFLAGS="$saved_cflags"
+LDFLAGS="$saved_ldflags"
+
 AC_SUBST(x_cflags)
 AC_SUBST(x_includes)
 AC_SUBST(x_ldflags)
@@ -404,7 +404,7 @@ need_x_locale=yes)
 AC_MSG_RESULT($need_x_locale)
 
 if test $need_x_locale = yes; then
-  CFLAGS="$CFLAGS -DX_LOCALE"
+  GTK_LOCALE_CFLAGS="-DX_LOCALE"
 fi
 
 # Checks for header files.
@@ -493,6 +493,11 @@ fi
 AC_MSG_RESULT($gtk_ok)
 AC_SUBST(GDK_WLIBS)
 
+AC_SUBST(GTK_DEBUG_FLAGS)
+AC_SUBST(GTK_XIM_FLAGS)
+AC_SUBST(GTK_LOCALE_FLAGS)
+AC_SUBST(GTK_THREAD_FLAGS)
+
 AC_OUTPUT([
 Makefile
 gtk-config