diff options
| author | Glenn Morris | 2013-06-30 14:53:36 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-06-30 14:53:36 -0400 |
| commit | 6d89e343ab402851d94e37b2ca79a67e4c6fb474 (patch) | |
| tree | f6a460d1fce7bee2e6a40249a42f5a2d674ddb1b | |
| parent | 9d3f2fc2866c3e39c668eeb36078f7f8f9b6dba9 (diff) | |
| download | emacs-6d89e343ab402851d94e37b2ca79a67e4c6fb474.tar.gz emacs-6d89e343ab402851d94e37b2ca79a67e4c6fb474.zip | |
Auto-commit of generated files.
| -rwxr-xr-x | autogen/configure | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/autogen/configure b/autogen/configure index 46d4737caf6..4e53f52e0b6 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -11303,6 +11303,7 @@ fi | |||
| 11303 | 11303 | ||
| 11304 | HAVE_GTK=no | 11304 | HAVE_GTK=no |
| 11305 | GTK_OBJ= | 11305 | GTK_OBJ= |
| 11306 | gtk_term_header=$term_header | ||
| 11306 | check_gtk2=no | 11307 | check_gtk2=no |
| 11307 | gtk3_pkg_errors= | 11308 | gtk3_pkg_errors= |
| 11308 | if test "${opsys}" != "mingw32"; then | 11309 | if test "${opsys}" != "mingw32"; then |
| @@ -11370,7 +11371,7 @@ $as_echo "no" >&6; } | |||
| 11370 | $as_echo "#define HAVE_GTK3 1" >>confdefs.h | 11371 | $as_echo "#define HAVE_GTK3 1" >>confdefs.h |
| 11371 | 11372 | ||
| 11372 | GTK_OBJ=emacsgtkfixed.o | 11373 | GTK_OBJ=emacsgtkfixed.o |
| 11373 | term_header=gtkutil.h | 11374 | gtk_term_header=gtkutil.h |
| 11374 | USE_GTK_TOOLKIT="GTK3" | 11375 | USE_GTK_TOOLKIT="GTK3" |
| 11375 | if test "x$ac_enable_gtk_deprecation_warnings" = x; then | 11376 | if test "x$ac_enable_gtk_deprecation_warnings" = x; then |
| 11376 | GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" | 11377 | GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" |
| @@ -11467,6 +11468,7 @@ fi | |||
| 11467 | done | 11468 | done |
| 11468 | 11469 | ||
| 11469 | if test "${GTK_COMPILES}" != "yes"; then | 11470 | if test "${GTK_COMPILES}" != "yes"; then |
| 11471 | GTK_OBJ= | ||
| 11470 | if test "$USE_X_TOOLKIT" != "maybe"; then | 11472 | if test "$USE_X_TOOLKIT" != "maybe"; then |
| 11471 | as_fn_error "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5; | 11473 | as_fn_error "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5; |
| 11472 | fi | 11474 | fi |
| @@ -11476,6 +11478,7 @@ done | |||
| 11476 | $as_echo "#define USE_GTK 1" >>confdefs.h | 11478 | $as_echo "#define USE_GTK 1" >>confdefs.h |
| 11477 | 11479 | ||
| 11478 | GTK_OBJ="gtkutil.o $GTK_OBJ" | 11480 | GTK_OBJ="gtkutil.o $GTK_OBJ" |
| 11481 | term_header=$gtk_term_header | ||
| 11479 | USE_X_TOOLKIT=none | 11482 | USE_X_TOOLKIT=none |
| 11480 | if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then | 11483 | if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then |
| 11481 | : | 11484 | : |