Apply patch from John Margaglione converting from args to properties.

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 8fe5613e5c2c9dd2224026f636cc9c0e5f7535dc..590460ff1f4a65d3201755589f1809aeb8f5b744 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=3
-GTK_MICRO_VERSION=4
+GTK_MICRO_VERSION=5
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -563,18 +563,18 @@ AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
 AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
 AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
 
-if test $dynworks = no ; then
+if $dynworks ; then
   STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
 else
   STATIC_LIB_DEPS=
   if echo "$included_loaders" | grep "\(^\|\,\)tiff\(\$\|\,\)" > /dev/null; then
-    STATIC_LIB_DEPS="STATIC_LIB_DEPS $LIBTIFF"
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
   fi
   if echo "$included_loaders" | grep "\(^\|\,\)jpeg\(\$\|\,\)" > /dev/null; then
-    STATIC_LIB_DEPS="STATIC_LIB_DEPS $LIBJPEG"
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
   fi
   if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then
-    STATIC_LIB_DEPS="STATIC_LIB_DEPS $LIBPNG"
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
   fi
 fi