From 5f6a587f307d47878dfa44058c613fefab4ecac3 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Mon, 12 Dec 2005 03:15:52 +0000 Subject: Prevent core dumps with GTK by disabling secondary X connections there. * src/xterm.c (x_term_init) [!HAVE_GTK_MULTIDISPLAY]: Refuse to create secondary X connections. * configure.in (HAVE_GTK_MULTIDISPLAY): Disable test, unconditionally undefine. * configure: Regenerate. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-450 --- configure.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b39a7e85678..f413c57db55 100644 --- a/configure.in +++ b/configure.in @@ -2011,12 +2011,15 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then dnl Check if we can use multiple displays with this GTK version. dnl If gdk_display_open exists, assume all others are there also. + dnl XXX The multidisplay feature is severely broken in current GTK + dnl versions. --lorentey HAVE_GTK_MULTIDISPLAY=no - AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) - if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then - AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, - [Define to 1 if GTK can handle more than one display.]) - fi + dnl AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) + dnl if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then + dnl AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, + dnl [Define to 1 if GTK can handle more than one display.]) + dnl fi + dnl Check if we have the old file selection dialog. dnl If gdk_display_open exists, assume all others are there also. HAVE_GTK_FILE_SELECTION=no -- cgit v1.2.1 From fa1b1007cac59bafd16df7bd501ef2591dd77d62 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Sat, 24 Feb 2007 20:29:24 +0000 Subject: Re-enable GTK multidisplay support. * configure.in (HAVE_GTK_MULTIDISPLAY): Remove override. * configure: Regenerate. * xterm.c (x_term_init): Reword error string for GTK. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-598 --- configure.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 2981e8888f0..625faa9f60f 100644 --- a/configure.in +++ b/configure.in @@ -2069,14 +2069,11 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then dnl Check if we can use multiple displays with this GTK version. dnl If gdk_display_open exists, assume all others are there also. - dnl XXX The multidisplay feature is severely broken in current GTK - dnl versions. --lorentey - HAVE_GTK_MULTIDISPLAY=no - dnl AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) - dnl if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then - dnl AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, - dnl [Define to 1 if GTK can handle more than one display.]) - dnl fi + AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) + if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then + AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, + [Define to 1 if GTK can handle more than one display.]) + fi dnl Check if we have the old file selection dialog. dnl If gdk_display_open exists, assume all others are there also. -- cgit v1.2.1 From 3410a55056bd9c4ea03d421ba955636df5b7ef6c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 27 Aug 2007 07:31:50 +0000 Subject: (HAVE_GTK_MULTIDISPLAY): Restore explicit initialization, the absence of which was a needless difference from the trunk. --- configure.in | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index ecd65624890..5b9f7539bec 100644 --- a/configure.in +++ b/configure.in @@ -2180,6 +2180,7 @@ if test "${HAVE_GTK}" = "yes"; then dnl Check if we can use multiple displays with this GTK version. dnl If gdk_display_open exists, assume all others are there also. + HAVE_GTK_MULTIDISPLAY=no AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, -- cgit v1.2.1 From c982cf7d879ba60689923257bf4ea90b1eb5c6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Wed, 29 Aug 2007 06:36:57 +0000 Subject: New option: --without-xaw3d. --- configure.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d1796ca41e8..b5f4eb8e6df 100644 --- a/configure.in +++ b/configure.in @@ -119,6 +119,8 @@ AC_ARG_WITH(pkg-config-prog, AC_ARG_WITH(toolkit-scroll-bars, [ --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars]) +AC_ARG_WITH(xpm, +[ --without-xaw3d don't use Xaw3d]) AC_ARG_WITH(xim, [ --without-xim don't use X11 XIM]) AC_ARG_WITH(carbon, @@ -2300,14 +2302,18 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then if test x"${HAVE_X11R5}" != xyes; then USE_X_TOOLKIT=none else - AC_MSG_CHECKING(for xaw3d) - AC_CACHE_VAL(emacs_cv_xaw3d, - [AC_TRY_LINK([ + if test "$with_xaw3d" != no; then + AC_MSG_CHECKING(for xaw3d) + AC_CACHE_VAL(emacs_cv_xaw3d, + [AC_TRY_LINK([ #include #include ], - [], - emacs_cv_xaw3d=yes, - emacs_cv_xaw3d=no)]) + [], + emacs_cv_xaw3d=yes, + emacs_cv_xaw3d=no)]) + else + emacs_cv_xaw3d=no + fi if test $emacs_cv_xaw3d = yes; then AC_MSG_RESULT([yes; using Lucid toolkit]) USE_X_TOOLKIT=LUCID -- cgit v1.2.1 From 89ce934da29b39b53e617206a2741956a4d6a53f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 30 Aug 2007 05:08:33 +0000 Subject: (AH_BOTTOM): Copy some manual changes made to src/config.in here so they are not lost when it regenerates. --- configure.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b5f4eb8e6df..bcdd605ea8e 100644 --- a/configure.in +++ b/configure.in @@ -3,8 +3,8 @@ dnl To rebuild the `configure' script from this, execute the command dnl autoconf dnl in the directory containing this script. dnl -dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -dnl Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, +dnl 2004, 2005, 2006, 2007 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -3120,6 +3120,13 @@ AH_BOTTOM([ #define HAVE_MOUSE #endif +/* Multi-tty support relies on MULTI_KBOARD. It seems safe to turn it + on unconditionally. Note that src/s/darwin.h disables this at + present. */ +#ifndef MULTI_KBOARD +#define MULTI_KBOARD +#endif + /* If we're using the Carbon API on Mac OS X, define a few more variables as well. */ #ifdef HAVE_CARBON -- cgit v1.2.1 From f67842bb0fc1c653dee35ef5ee8f7f17136ab8be Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 31 Aug 2007 19:12:54 +0000 Subject: Fix typo. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index bcdd605ea8e..fc49170bf94 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ AC_ARG_WITH(pkg-config-prog, AC_ARG_WITH(toolkit-scroll-bars, [ --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars]) -AC_ARG_WITH(xpm, +AC_ARG_WITH(xaw3d, [ --without-xaw3d don't use Xaw3d]) AC_ARG_WITH(xim, [ --without-xim don't use X11 XIM]) -- cgit v1.2.1 From 28aa2c3e65bfbbd8a1db965b41e5a2632d53f147 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 1 Sep 2007 23:26:52 +0000 Subject: Put quotes around nested macro calls. --- configure.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index fc49170bf94..4db05455ba8 100644 --- a/configure.in +++ b/configure.in @@ -2281,7 +2281,7 @@ if test "${HAVE_GTK}" = "yes"; then CFLAGS="$CFLAGS $XFT_CFLAGS" LIBS="$XFT_LIBS $LIBS" AC_CHECK_HEADER(X11/Xft/Xft.h, - AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)) + [AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)]) if test "${HAVE_XFT}" = "yes"; then AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.]) @@ -2458,8 +2458,8 @@ AC_TRY_COMPILE([ #include #include ], [XIMProc callback;], - HAVE_XIM=yes - AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available]), + [HAVE_XIM=yes + AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])], HAVE_XIM=no) dnl `--with-xim' now controls only the initial value of use_xim at run time. @@ -2509,7 +2509,7 @@ HAVE_XPM=no if test "${HAVE_X11}" = "yes"; then if test "${with_xpm}" != "no"; then AC_CHECK_HEADER(X11/xpm.h, - AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)) + [AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)]) if test "${HAVE_XPM}" = "yes"; then AC_MSG_CHECKING(for XpmReturnAllocPixels preprocessor define) AC_EGREP_CPP(no_return_alloc_pixels, @@ -2539,7 +2539,7 @@ if test "${HAVE_X11}" = "yes"; then dnl Checking for jpeglib.h can lose because of a redefinition of dnl HAVE_STDLIB_H. AC_CHECK_HEADER(jerror.h, - AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)) + [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)]) fi AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl @@ -2549,7 +2549,7 @@ if test "${HAVE_X11}" = "yes"; then [#include version=JPEG_LIB_VERSION ], - AC_DEFINE(HAVE_JPEG), + [AC_DEFINE(HAVE_JPEG)], [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) fi @@ -2577,10 +2577,10 @@ HAVE_TIFF=no if test "${HAVE_X11}" = "yes"; then if test "${with_tiff}" != "no"; then AC_CHECK_HEADER(tiffio.h, - tifflibs="-lz -lm" + [tifflibs="-lz -lm" # At least one tiff package requires the jpeg library. if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi - AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)) + AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)]) fi if test "${HAVE_TIFF}" = "yes"; then @@ -2594,7 +2594,7 @@ if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then AC_CHECK_HEADER(gif_lib.h, # EGifPutExtensionLast only exists from version libungif-4.1.0b1. # Earlier versions can crash Emacs. - AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes)) + [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes)]) if test "$HAVE_GIF" = yes; then ac_gif_lib_name="-lgif" @@ -2644,7 +2644,7 @@ fi HAVE_GPM=no if test "${with_gpm}" != "no"; then AC_CHECK_HEADER(gpm.h, - AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)) + [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)]) fi if test "${HAVE_GPM}" = "yes"; then @@ -2652,7 +2652,7 @@ if test "${HAVE_GPM}" = "yes"; then fi dnl Check for malloc/malloc.h on darwin -AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the header file.])) +AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the header file.])]) ### Use Mac OS X Carbon API to implement GUI. if test "${HAVE_CARBON}" = "yes"; then @@ -2673,7 +2673,7 @@ fi HAVE_X_SM=no if test "${HAVE_X11}" = "yes"; then AC_CHECK_HEADER(X11/SM/SMlib.h, - AC_CHECK_LIB(SM, SmcOpenConnection, HAVE_X_SM=yes, , -lICE)) + [AC_CHECK_LIB(SM, SmcOpenConnection, HAVE_X_SM=yes, , -lICE)]) if test "${HAVE_X_SM}" = "yes"; then AC_DEFINE(HAVE_X_SM, 1, [Define to 1 if you have the SM library (-lSM).]) @@ -2784,8 +2784,8 @@ if test "$with_hesiod" = yes ; then RESOLVLIB= fi AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost, - AC_DEFINE(HAVE_LIBHESIOD, 1, - [Define to 1 if you have the hesiod library (-lhesiod).]), + [AC_DEFINE(HAVE_LIBHESIOD, 1, + [Define to 1 if you have the hesiod library (-lhesiod).])], :, $RESOLVLIB)]) fi @@ -2797,9 +2797,9 @@ if test "${with_kerberos+set}" = set; then AC_CHECK_LIB(krb5, krb5_init_context) if test "${with_kerberos5+set}" != set; then AC_CHECK_LIB(des425, des_cbc_encrypt,, - AC_CHECK_LIB(des, des_cbc_encrypt)) + [AC_CHECK_LIB(des, des_cbc_encrypt)]) AC_CHECK_LIB(krb4, krb_get_cred,, - AC_CHECK_LIB(krb, krb_get_cred)) + [AC_CHECK_LIB(krb, krb_get_cred)]) fi if test "${with_kerberos5+set}" = set; then -- cgit v1.2.1 From eb11f5b8c16dfdb87fdbdabde0a368d49df2763b Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 2 Sep 2007 08:25:00 +0000 Subject: (EMACS_ARG_Y, EMACS_ARG_N): New AC_DEFUNs. Use them throughout in place of AC_ARG_WITH calls. --- configure.in | 78 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 42 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 4db05455ba8..c1c8c5cd0b9 100644 --- a/configure.in +++ b/configure.in @@ -42,25 +42,33 @@ gamedir='${localstatedir}/games/emacs' gameuser=games -AC_ARG_WITH(gcc, -[ --without-gcc don't use GCC to compile Emacs if GCC is found]) -AC_ARG_WITH(pop, -[ --without-pop don't support POP mail retrieval with movemail], +dnl Autoconf is so much less fun under VMS, maybe +dnl because everything is less fun under VMS. --ttn +AC_DEFUN([EMACS_ARG_Y],[dnl +AC_ARG_WITH([$1],[AS_HELP_STRING([--with-$1],[$2])],[$3],[$4])dnl +])dnl +AC_DEFUN([EMACS_ARG_N],[dnl +AC_ARG_WITH([$1],[AS_HELP_STRING([--without-$1],[$2])],[$3],[$4])dnl +])dnl + +EMACS_ARG_N([gcc],[don't use GCC to compile Emacs if GCC is found]) + +EMACS_ARG_N([pop],[don't support POP mail retrieval with movemail], [if test "$withval" = yes; then AC_DEFINE(MAIL_USE_POP) else : fi], AC_DEFINE(MAIL_USE_POP)) AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl -AC_ARG_WITH(kerberos, -[ --with-kerberos support Kerberos-authenticated POP], + +EMACS_ARG_Y([kerberos],[support Kerberos-authenticated POP], [if test "$withval" = yes; then AC_DEFINE(KERBEROS) fi]) AH_TEMPLATE(KERBEROS, [Define to support Kerberos-authenticated POP mail retrieval.])dnl -AC_ARG_WITH(kerberos5, -[ --with-kerberos5 support Kerberos version 5 authenticated POP], + +EMACS_ARG_Y([kerberos5],[support Kerberos version 5 authenticated POP], [if test "${with_kerberos5+set}" = set; then if test "${with_kerberos+set}" != set; then with_kerberos=yes @@ -68,21 +76,19 @@ AC_ARG_WITH(kerberos5, fi AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.]) fi]) -AC_ARG_WITH(hesiod, -[ --with-hesiod support Hesiod to get the POP server host], + +EMACS_ARG_Y([hesiod],[support Hesiod to get the POP server host], [if test "$withval" = yes; then AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.]) fi]) -AC_ARG_WITH(sound, -[ --without-sound don't compile with sound support]) +EMACS_ARG_N([sound],[don't compile with sound support]) dnl This should be the last --with option, because --with-x is dnl added later on when we find the path of X, and it's best to dnl keep them together visually. -AC_ARG_WITH(x-toolkit, -[ --with-x-toolkit=KIT use an X toolkit - (KIT = yes/lucid/athena/motif/gtk/no)], +AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT], + [use an X toolkit (KIT one of: yes, lucid, athena, motif, gtk, no)])], [ case "${withval}" in y | ye | yes ) val=gtk ;; n | no ) val=no ;; @@ -98,33 +104,21 @@ this option's value should be `yes', `no', `lucid', `athena', `motif' or `gtk'. esac with_x_toolkit=$val ]) -AC_ARG_WITH(xpm, -[ --with-xpm use -lXpm for displaying XPM images]) -AC_ARG_WITH(jpeg, -[ --with-jpeg use -ljpeg for displaying JPEG images]) -AC_ARG_WITH(tiff, -[ --with-tiff use -ltiff for displaying TIFF images]) -AC_ARG_WITH(gif, -[ --with-gif use -lgif (or -lungif) for displaying GIF images]) -AC_ARG_WITH(png, -[ --with-png use -lpng for displaying PNG images]) -AC_ARG_WITH(gpm, -[ --with-gpm use -lgpm for mouse support on a GNU/Linux console]) -AC_ARG_WITH(rsvg, -[ --with-rsvg use -lrsvg-2 for displaying SVG images]) -AC_ARG_WITH(gtk, -[ --with-gtk use GTK (same as --with-x-toolkit=gtk)]) -AC_ARG_WITH(pkg-config-prog, -[ --with-pkg-config-prog Path to pkg-config to use for finding GTK and librsvg]) -AC_ARG_WITH(toolkit-scroll-bars, -[ --without-toolkit-scroll-bars - don't use Motif or Xaw3d scroll bars]) -AC_ARG_WITH(xaw3d, -[ --without-xaw3d don't use Xaw3d]) -AC_ARG_WITH(xim, -[ --without-xim don't use X11 XIM]) -AC_ARG_WITH(carbon, -[ --without-carbon don't use Carbon GUI on Mac OS X]) + +EMACS_ARG_Y([xpm],[use -lXpm for displaying XPM images]) +EMACS_ARG_Y([jpeg],[use -ljpeg for displaying JPEG images]) +EMACS_ARG_Y([tiff],[use -ltiff for displaying TIFF images]) +EMACS_ARG_Y([gif],[use -lgif (or -lungif) for displaying GIF images]) +EMACS_ARG_Y([png],[use -lpng for displaying PNG images]) +EMACS_ARG_Y([gpm],[use -lgpm for mouse support on a GNU/Linux console]) +EMACS_ARG_Y([rsvg],[use -lrsvg-2 for displaying SVG images]) +EMACS_ARG_Y([gtk],[use GTK (same as --with-x-toolkit=gtk)]) +EMACS_ARG_Y([pkg-config-prog],[Path to pkg-config for finding GTK and librsvg]) +EMACS_ARG_N([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) +EMACS_ARG_N([xaw3d],[don't use Xaw3d]) +EMACS_ARG_N([xim],[don't use X11 XIM]) +EMACS_ARG_N([carbon],[don't use Carbon GUI on Mac OS X]) + AC_ARG_ENABLE(carbon-app, [[ --enable-carbon-app[=DIR] [DIR=/Application] specify install directory for Emacs.app on Mac OS X]], -- cgit v1.2.1 From f893281966b564ac2b866513709b0d3fdd65ccfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 2 Sep 2007 17:30:16 +0000 Subject: Require Gtk/Glib 2.6. --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c1c8c5cd0b9..b913cf710d5 100644 --- a/configure.in +++ b/configure.in @@ -2170,8 +2170,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); fi - GLIB_REQUIRED=2.4 - GTK_REQUIRED=2.4 + GLIB_REQUIRED=2.6 + GTK_REQUIRED=2.6 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Check if --with-pkg-config-prog has been given. -- cgit v1.2.1 From aee22295d4ead21228f98c76bb01ecaa9adf2963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 2 Sep 2007 17:35:49 +0000 Subject: Require Gtk/Glib 2.6. --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index eed8891aa5c..3a3c56d196d 100644 --- a/configure.in +++ b/configure.in @@ -2100,8 +2100,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); fi - GLIB_REQUIRED=2.4 - GTK_REQUIRED=2.4 + GLIB_REQUIRED=2.6 + GTK_REQUIRED=2.6 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Check if --with-pkg-config-prog has been given. -- cgit v1.2.1 From 1eb2208880dd6a0122638adc62d66d4f3407b05c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 2 Sep 2007 18:24:57 +0000 Subject: Use AS_HELP_STRING throughout. --- configure.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b913cf710d5..1bb1d355206 100644 --- a/configure.in +++ b/configure.in @@ -120,18 +120,20 @@ EMACS_ARG_N([xim],[don't use X11 XIM]) EMACS_ARG_N([carbon],[don't use Carbon GUI on Mac OS X]) AC_ARG_ENABLE(carbon-app, -[[ --enable-carbon-app[=DIR] [DIR=/Application] - specify install directory for Emacs.app on Mac OS X]], +[AS_HELP_STRING([--enable-carbon-app@<:@=DIR@:>@], + [specify install directory for Emacs.app on Mac OS X + [DIR=/Application]])], [ carbon_appdir_x=${enableval}]) AC_ARG_ENABLE(asserts, -[ --enable-asserts compile code with asserts enabled], +[AS_HELP_STRING([--enable-asserts], [compile code with asserts enabled])], USE_XASSERTS=$enableval, USE_XASSERTS=no) AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], +[AS_HELP_STRING([--enable-maintainer-mode], + [enable make rules and dependencies not useful (and sometimes + confusing) to the casual installer])], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) if test $USE_MAINTAINER_MODE = yes; then @@ -142,9 +144,9 @@ fi AC_SUBST(MAINT) AC_ARG_ENABLE(locallisppath, -[ --enable-locallisppath=PATH - directories Emacs should search for lisp files - specific to this site], +[AS_HELP_STRING([--enable-locallisppath=PATH], + [directories Emacs should search for lisp files specific + to this site])], if test "${enableval}" = "no"; then locallisppath= elif test "${enableval}" != "yes"; then -- cgit v1.2.1 From 62b1c28f7a174d81e982f6664c0988d5475fdf92 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 6 Sep 2007 05:11:11 +0000 Subject: (AC_OUTPUT): Update names of generated Makefiles for new doc/ directory layout. --- configure.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 1bb1d355206..c873a290020 100644 --- a/configure.in +++ b/configure.in @@ -3455,8 +3455,9 @@ AC_EGREP_CPP(yes..yes, CPP_NEED_TRADITIONAL=yes) AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ - man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \ - lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile, [ + doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ + doc/lispref/Makefile src/Makefile.c:src/Makefile.in \ + lwlib/Makefile lisp/Makefile leim/Makefile, [ ### Make the necessary directories, if they don't exist. for dir in etc lisp ; do -- cgit v1.2.1 From 4756ee429c7e52444f1d8ae4629db9327411e048 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 12 Sep 2007 07:03:30 +0000 Subject: (AC_FUNC_ALLOCA): Throw an error if a system implementation of alloca is not found. --- configure.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c873a290020..306f8441973 100644 --- a/configure.in +++ b/configure.in @@ -2692,6 +2692,13 @@ fi AC_FUNC_ALLOCA +dnl src/alloca.c has been removed. Could also check if $ALLOCA is set? +dnl FIXME is there an autoconf test that does the right thing, without +dnl needing to call A_M_E afterwards? +if test x"$ac_cv_func_alloca_works" != xyes; then + AC_MSG_ERROR( [a system implementation of alloca is required] ) +fi + # fmod, logb, and frexp are found in -lm on most systems. # On HPUX 9.01, -lm does not contain logb, so check for sqrt. AC_CHECK_LIB(m, sqrt) -- cgit v1.2.1 From d4840f44f76157dac920967177aca0791f95a10c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 Sep 2007 19:45:45 +0000 Subject: Fix makeinfo version regexp. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 306f8441973..3686753e8c7 100644 --- a/configure.in +++ b/configure.in @@ -1347,7 +1347,7 @@ AC_PATH_PROG(MAKEINFO, makeinfo, no) dnl By this stage, configure has already checked for egrep and set EGREP, dnl or exited with an error if no egrep was found. if test "$MAKEINFO" != "no" && \ - test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[5-9]]|4\.[[6-9]])'`" = x; then + test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[6-9]]|4\.[[1-5]][[0-9]]+)'`" = x; then MAKEINFO=no fi -- cgit v1.2.1 From 846d1b3e948004ade6fc49aad33442b0de450c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 16 Sep 2007 09:13:28 +0000 Subject: Don't use -lpthread on HP-UX. --- configure.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 3a3c56d196d..315c033aeaa 100644 --- a/configure.in +++ b/configure.in @@ -2165,7 +2165,10 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then AC_CHECK_LIB(pthread, pthread_self, HAVE_GTK_AND_PTHREAD=yes) fi if test "$HAVE_GTK_AND_PTHREAD" = yes; then - GTK_LIBS="$GTK_LIBS -lpthread" + case "${canonical}" in + *-hpux*) ;; + *) GTK_LIBS="$GTK_LIBS -lpthread" ;; + esac AC_DEFINE(HAVE_GTK_AND_PTHREAD, 1, [Define to 1 if you have GTK and pthread (-lpthread).]) fi -- cgit v1.2.1