diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-05-17 16:46:34 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-05-17 16:46:34 +0200 |
| commit | 6445ee0fb751ae2c1dfef900d44721b3d952812f (patch) | |
| tree | d43006cb93d9ea7b00ea02aabcd5577c41ff827f /configure.ac | |
| parent | f92ac2e82ed199d6f25d2a59508e08addb1150ac (diff) | |
| parent | c9c4708ed47b18987940a71b98eb9873150d2b95 (diff) | |
| download | emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.tar.gz | |
Merge branch 'master' into cairo
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index bc7081de02b..fff3db90e50 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,9 +1662,7 @@ dnl AC_C_BIGENDIAN is done by gnulib. dnl check for Make feature -DEPFLAGS= -MKDEPDIR=":" -deps_frag=deps.mk +AUTO_DEPEND=no dnl check if we have GCC and autodepend is on. if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then AC_MSG_CHECKING([whether gcc understands -MMD -MF]) @@ -1676,24 +1674,10 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then rm -rf deps.d AC_MSG_RESULT([$ac_enable_autodepend]) if test $ac_enable_autodepend = yes; then - DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d -MP' - ## MKDIR_P is documented (see AC_PROG_MKDIR_P) to be parallel-safe. - MKDEPDIR='${MKDIR_P} ${DEPDIR}' - deps_frag=autodeps.mk + AUTO_DEPEND=yes fi fi -lwlib_deps_frag=$srcdir/lwlib/$deps_frag -oldxmenu_deps_frag=$srcdir/oldXMenu/$deps_frag -deps_frag=$srcdir/src/$deps_frag -AC_SUBST(MKDEPDIR) -AC_SUBST(DEPFLAGS) -AC_SUBST_FILE(deps_frag) -AC_SUBST_FILE(lwlib_deps_frag) -AC_SUBST_FILE(oldxmenu_deps_frag) - -lisp_frag=$srcdir/src/lisp.mk -AC_SUBST_FILE(lisp_frag) - +AC_SUBST(AUTO_DEPEND) dnl checks for operating system services AC_SYS_LONG_FILE_NAMES @@ -2498,15 +2482,12 @@ if test x"$pkg_check_gtk" = xyes; then GTK_OBJ="gtkutil.o $GTK_OBJ" term_header=$gtk_term_header USE_X_TOOLKIT=none - if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then - : - else - AC_MSG_WARN([[Your version of Gtk+ will have problems with + AC_MSG_WARN([[Your version of Gtk+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them - Emacs may crash.]]) - sleep 3 - fi + Emacs may crash. + See http://bugzilla.gnome.org/show_bug.cgi?id=85715]]) + sleep 3 fi fi |