diff options
| author | Jan Djärv | 2006-01-31 15:34:16 +0000 |
|---|---|---|
| committer | Jan Djärv | 2006-01-31 15:34:16 +0000 |
| commit | 448541bcd937b7fe28b5b61343cd3b7149f43ef6 (patch) | |
| tree | e75df89a9b02b10d9e293174770d193e8b2e9663 | |
| parent | cd7cd4ac236450f97d4867c9278c2394c6688cf7 (diff) | |
| download | emacs-448541bcd937b7fe28b5b61343cd3b7149f43ef6.tar.gz emacs-448541bcd937b7fe28b5b61343cd3b7149f43ef6.zip | |
* configure.in: Require GTK 2.4 or newer.
* configure: Regenerate
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 9 insertions, 4 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-01-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * configure.in: Require GTK 2.4 or newer. | ||
| 4 | * configure: Regenerate | ||
| 5 | |||
| 1 | 2006-01-29 Michael Olson <mwolson@gnu.org> | 6 | 2006-01-29 Michael Olson <mwolson@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in (install-arch-indep, uninstall): Add ERC. | 8 | * Makefile.in (install-arch-indep, uninstall): Add ERC. |
| @@ -10200,8 +10200,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then | |||
| 10200 | echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} | 10200 | echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} |
| 10201 | { (exit 1); exit 1; }; }; | 10201 | { (exit 1); exit 1; }; }; |
| 10202 | fi | 10202 | fi |
| 10203 | GLIB_REQUIRED=2.0.1 | 10203 | GLIB_REQUIRED=2.4 |
| 10204 | GTK_REQUIRED=2.0.1 | 10204 | GTK_REQUIRED=2.4 |
| 10205 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 10205 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
| 10206 | 10206 | ||
| 10207 | if test "X${with_pkg_config_prog}" != X; then | 10207 | if test "X${with_pkg_config_prog}" != X; then |
diff --git a/configure.in b/configure.in index 2318c1b9197..2982f4c2fc2 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -2000,8 +2000,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then | |||
| 2000 | if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then | 2000 | if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then |
| 2001 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); | 2001 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); |
| 2002 | fi | 2002 | fi |
| 2003 | GLIB_REQUIRED=2.0.1 | 2003 | GLIB_REQUIRED=2.4 |
| 2004 | GTK_REQUIRED=2.0.1 | 2004 | GTK_REQUIRED=2.4 |
| 2005 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 2005 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
| 2006 | 2006 | ||
| 2007 | dnl Check if --with-pkg-config-prog has been given. | 2007 | dnl Check if --with-pkg-config-prog has been given. |