aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2003-08-19 08:23:12 +0000
committerLute Kamstra2003-08-19 08:23:12 +0000
commite512ece1300cccdd8a6d70e514c3191b3fbd6766 (patch)
tree994de9ffd85d174f7c8e455f11b478a0b1fd1ba0
parent2ceeffa4b333adb8905f09d1e09df2aac4792b5f (diff)
downloademacs-e512ece1300cccdd8a6d70e514c3191b3fbd6766.tar.gz
emacs-e512ece1300cccdd8a6d70e514c3191b3fbd6766.zip
Regenerate.
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1033a51d6ca..b406649c246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12003-08-18 Lute Kamstra <Lute.Kamstra@cwi.nl>
2
3 * configure.in: Revert the change of 2003-07-29 as GTK+ 2.2 is not
4 required anymore.
5
12003-08-07 Andrew Choi <akochoi@shaw.ca> 62003-08-07 Andrew Choi <akochoi@shaw.ca>
2 7
3 * configure.in [powerpc-apple-darwin*]: Use the -no-cpp-precomp 8 * configure.in [powerpc-apple-darwin*]: Use the -no-cpp-precomp
diff --git a/configure b/configure
index 75602df1483..cdde291480d 100755
--- a/configure
+++ b/configure
@@ -8192,7 +8192,7 @@ echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with
8192 { (exit 1); exit 1; }; }; 8192 { (exit 1); exit 1; }; };
8193 fi 8193 fi
8194 GLIB_REQUIRED=2.0.1 8194 GLIB_REQUIRED=2.0.1
8195 GTK_REQUIRED=2.2 8195 GTK_REQUIRED=2.0.1
8196 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 8196 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
8197 8197
8198 if test "X${with_pkg_config_prog}" != X; then 8198 if test "X${with_pkg_config_prog}" != X; then