diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/configure.ac b/configure.ac index 4cb3c354da..d2f21eedda 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf script for GNU Emacs -dnl To rebuild the `configure' script from this, execute the command -dnl autoconf +dnl To rebuild the 'configure' script from this, execute the command +dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl @@ -283,8 +283,8 @@ AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE], default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW, Cygwin.])], [ case "${withval}" in yes|no|alsa|oss|bsd-ossaudio) val=$withval ;; - *) AC_MSG_ERROR([`--with-sound=$withval' is invalid; -this option's value should be `yes', `no', `alsa', `oss', or `bsd-ossaudio'.]) + *) AC_MSG_ERROR(['--with-sound=$withval' is invalid; +this option's value should be 'yes', 'no', 'alsa', 'oss', or 'bsd-ossaudio'.]) ;; esac with_sound=$val @@ -307,10 +307,10 @@ AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT], gtk2 ) val=gtk2 ;; gtk3 ) val=gtk3 ;; * ) -AC_MSG_ERROR([`--with-x-toolkit=$withval' is invalid; -this option's value should be `yes', `no', `lucid', `athena', `motif', `gtk', -`gtk2' or `gtk3'. `yes' and `gtk' are synonyms. -`athena' and `lucid' are synonyms.]) +AC_MSG_ERROR(['--with-x-toolkit=$withval' is invalid; +this option's value should be 'yes', 'no', 'lucid', 'athena', 'motif', 'gtk', +'gtk2' or 'gtk3'. 'yes' and 'gtk' are synonyms. +'athena' and 'lucid' are synonyms.]) ;; esac with_x_toolkit=$val @@ -359,10 +359,10 @@ AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB], g | gf | gfi | gfil | gfile ) val=gfile ;; i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;; w | w3 | w32 ) val=w32 ;; - * ) AC_MSG_ERROR([`--with-file-notification=$withval' is invalid; -this option's value should be `yes', `no', `gfile', `inotify' or `w32'. -`yes' is a synonym for `w32' on MS-Windows, for `no' on Nextstep, -otherwise for the first of `gfile' or `inotify' that is usable.]) + * ) AC_MSG_ERROR(['--with-file-notification=$withval' is invalid; +this option's value should be 'yes', 'no', 'gfile', 'inotify' or 'w32'. +'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep, +otherwise for the first of 'gfile' or 'inotify' that is usable.]) ;; esac with_file_notification=$val @@ -458,8 +458,8 @@ do ac_gc_check_cons_list=1 ; ac_glyphs_debug=1 ;; # these enable particular checks - stringbytes) ac_gc_check_stringbytes=1 ;; - stringoverrun) ac_gc_check_string_overrun=1 ;; + stringbytes) ac_gc_check_stringbytes=1 ;; + stringoverrun) ac_gc_check_string_overrun=1 ;; stringfreelist) ac_gc_check_string_free_list=1 ;; xmallocoverrun) ac_xmalloc_overrun=1 ;; conslist) ac_gc_check_cons_list=1 ;; @@ -530,7 +530,7 @@ AC_SUBST(PROFILING_CFLAGS) AC_ARG_ENABLE(autodepend, [AS_HELP_STRING([--enable-autodepend], [automatically generate dependencies to .h-files. - Requires gcc, enabled if found.])], + Requires gcc, enabled if found.])], [ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes]) AC_ARG_ENABLE(gtk-deprecation-warnings, @@ -538,7 +538,7 @@ AC_ARG_ENABLE(gtk-deprecation-warnings, [Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])], [ac_enable_gtk_deprecation_warnings="${enableval}"],[]) -dnl This used to use changequote, but, apart from `changequote is evil' +dnl This used to use changequote, but, apart from 'changequote is evil' dnl per the autoconf manual, we can speed up autoconf somewhat by quoting dnl the great gob of text. Thus it's not processed for possible expansion. dnl Just make sure the brackets remain balanced. @@ -645,7 +645,7 @@ case "${canonical}" in mips-sgi-irix6.5 ) opsys=irix6-5 # Without defining _LANGUAGE_C, things get masked out in the headers - # so that, for instance, grepping for `free' in stdlib.h fails and + # so that, for instance, grepping for 'free' in stdlib.h fails and # AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m). NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" ;; @@ -699,9 +699,9 @@ case "${canonical}" in # MinGW overrides and adds some system headers in nt/inc. GCC_TEST_OPTIONS="-I $srcdir/nt/inc" ;; - *-sysv4.2uw* ) opsys=unixware ;; - *-sysv5uw* ) opsys=unixware ;; - *-sysv5OpenUNIX* ) opsys=unixware ;; + *-sysv4.2uw* ) opsys=unixware ;; + *-sysv5uw* ) opsys=unixware ;; + *-sysv5OpenUNIX* ) opsys=unixware ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac ;; @@ -742,9 +742,9 @@ fi dnl quotation ends if test $unported = yes; then - AC_MSG_ERROR([Emacs does not support `${canonical}' systems. + AC_MSG_ERROR([Emacs does not support '${canonical}' systems. If you think it should, please send a report to ${PACKAGE_BUGREPORT}. -Check `etc/MACHINES' for recognized configuration names.]) +Check 'etc/MACHINES' for recognized configuration names.]) fi #### Choose a compiler. @@ -1190,9 +1190,9 @@ if test "$MAKEINFO" = "no"; then HAVE_MAKEINFO=no elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your -source tree does not seem to have pre-built manuals in the `info' directory. +source tree does not seem to have pre-built manuals in the 'info' directory. Either install a suitable version of makeinfo, or re-run configure -with the `--without-makeinfo' option to build without the manuals.] ) +with the '--without-makeinfo' option to build without the manuals.] ) fi fi AC_SUBST(HAVE_MAKEINFO) @@ -1216,8 +1216,8 @@ fi dnl We need -znocombreloc if we're using a relatively recent GNU ld. dnl If we can link with the flag, it shouldn't do any harm anyhow. -dnl (Don't use `-z nocombreloc' as -z takes no arg on Irix.) -dnl Treat GCC specially since it just gives a non-fatal `unrecognized option' +dnl (Don't use '-z nocombreloc' as -z takes no arg on Irix.) +dnl Treat GCC specially since it just gives a non-fatal 'unrecognized option' dnl if not built to support GNU ld. dnl For a long time, -znocombreloc was added to LDFLAGS rather than @@ -1313,7 +1313,7 @@ esac LD_SWITCH_SYSTEM= case "$opsys" in freebsd|dragonfly) - ## Let `ld' find image libs and similar things in /usr/local/lib. + ## Let 'ld' find image libs and similar things in /usr/local/lib. ## The system compiler, GCC, has apparently been modified to not ## look there, contrary to what a stock GCC would do. ### It's not our place to do this. See bug#10313#17. @@ -1481,7 +1481,7 @@ esac AC_SUBST(LIB_MATH) AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE", - [The type of system you are compiling for; sets `system-type'.]) + [The type of system you are compiling for; sets 'system-type'.]) pre_PKG_CONFIG_CFLAGS=$CFLAGS @@ -1536,12 +1536,12 @@ if test "${with_sound}" != "no"; then LIBS="$ALSA_LIBS $LIBS" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])], emacs_alsa_normal=yes, - emacs_alsa_normal=no) + emacs_alsa_normal=no) if test "$emacs_alsa_normal" != yes; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]], [[snd_lib_error_set_handler (0);]])], emacs_alsa_subdir=yes, - emacs_alsa_subdir=no) + emacs_alsa_subdir=no) if test "$emacs_alsa_subdir" != yes; then AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.]) fi @@ -1617,7 +1617,7 @@ if test "$ac_cv_header_sys_sysinfo_h" = yes; then fi dnl On Solaris 8 there's a compilation warning for term.h because -dnl it doesn't define `bool'. +dnl it doesn't define 'bool'. AC_CHECK_HEADERS(term.h, , , -) AC_HEADER_TIME AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h> @@ -1831,7 +1831,7 @@ fail; CFLAGS="$CFLAGS $GNU_OBJC_CFLAGS" AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], - [AC_MSG_ERROR([`--with-ns' was specified, but the include + [AC_MSG_ERROR(['--with-ns' was specified, but the include files are missing or cannot be compiled.])]) macfont_file="" @@ -1852,7 +1852,7 @@ fail; AC_MSG_RESULT([$ns_osx_have_106]) if test $ns_osx_have_106 = no; then - AC_MSG_ERROR([`OSX 10.6 or newer is required']); + AC_MSG_ERROR([OSX 10.6 or newer is required]); fi fi fi @@ -1910,7 +1910,7 @@ if test "${with_w32}" != no; then case "${opsys}" in cygwin) AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], - [AC_MSG_ERROR([`--with-w32' was specified, but windows.h + [AC_MSG_ERROR(['--with-w32' was specified, but windows.h cannot be found.])]) ;; mingw32) @@ -2356,7 +2356,7 @@ fail; fi -### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. +### Use -lrsvg-2 if available, unless '--with-rsvg=no' is specified. HAVE_RSVG=no if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then if test "${with_rsvg}" != "no"; then @@ -2372,7 +2372,7 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = CFLAGS="$CFLAGS $RSVG_CFLAGS" # Windows loads librsvg dynamically if test "${opsys}" = "mingw32"; then - RSVG_LIBS= + RSVG_LIBS= fi fi fi @@ -2601,21 +2601,21 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then AC_MSG_CHECKING([whether GSettings is in gio]) AC_LINK_IFELSE( [AC_LANG_PROGRAM( - [[/* Check that gsettings really is present. */ - #include <glib-object.h> + [[/* Check that gsettings really is present. */ + #include <glib-object.h> #include <gio/gio.h> - ]], - [[ + ]], + [[ GSettings *settings; GVariant *val = g_settings_get_value (settings, ""); - ]])], - [], HAVE_GSETTINGS=no) + ]])], + [], HAVE_GSETTINGS=no) AC_MSG_RESULT([$HAVE_GSETTINGS]) if test "$HAVE_GSETTINGS" = "yes"; then AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) - SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" - SETTINGS_LIBS="$GSETTINGS_LIBS" + SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" + SETTINGS_LIBS="$GSETTINGS_LIBS" fi CFLAGS=$old_CFLAGS LIBS=$old_LIBS @@ -2695,7 +2695,7 @@ fi dnl MS Windows native file monitor is available for mingw32 only. case $with_file_notification,$opsys in w32,cygwin) - AC_MSG_ERROR([`--with-file-notification=w32' was specified, but + AC_MSG_ERROR(['--with-file-notification=w32' was specified, but this is only supported on MS-Windows native and MinGW32 builds. Consider using gfile instead.]) ;; @@ -2739,7 +2739,7 @@ esac case $with_file_notification,$NOTIFY_OBJ in yes,* | no,* | *,?*) ;; - *) AC_MSG_ERROR([File notification `$with_file_notification' requested but requirements not found.]) ;; + *) AC_MSG_ERROR([File notification '$with_file_notification' requested but requirements not found.]) ;; esac if test -n "$NOTIFY_OBJ"; then @@ -2941,7 +2941,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ 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. +dnl '--with-xim' now controls only the initial value of use_xim at run time. if test "${with_xim}" != "no"; then AC_DEFINE(USE_XIM, 1, @@ -2989,7 +2989,7 @@ fi ### Start of font-backend (under X11) section. if test "${HAVE_X11}" = "yes"; then - ## Use -lXft if available, unless `--with-xft=no'. + ## Use -lXft if available, unless '--with-xft=no'. HAVE_XFT=maybe if test "x${with_x}" = "xno"; then with_xft="no"; @@ -3094,7 +3094,7 @@ AC_SUBST(LIBOTF_LIBS) AC_SUBST(M17N_FLT_CFLAGS) AC_SUBST(M17N_FLT_LIBS) -### Use -lXpm if available, unless `--with-xpm=no'. +### Use -lXpm if available, unless '--with-xpm=no'. ### mingw32 doesn't use -lXpm, since it loads the library dynamically. ### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h ### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and @@ -3185,7 +3185,7 @@ fi AC_SUBST(LIBXPM) -### Use -ljpeg if available, unless `--with-jpeg=no'. +### Use -ljpeg if available, unless '--with-jpeg=no'. HAVE_JPEG=no LIBJPEG= if test "${with_jpeg}" != "no"; then @@ -3249,7 +3249,7 @@ if test "${HAVE_ZLIB}" = "yes"; then fi AC_SUBST(LIBZ) -### Use -lpng if available, unless `--with-png=no'. +### Use -lpng if available, unless '--with-png=no'. HAVE_PNG=no LIBPNG= PNG_CFLAGS= @@ -3313,7 +3313,7 @@ fi AC_SUBST(LIBPNG) AC_SUBST(PNG_CFLAGS) -### Use -ltiff if available, unless `--with-tiff=no'. +### Use -ltiff if available, unless '--with-tiff=no'. ### mingw32 doesn't use -ltiff, since it loads the library dynamically. HAVE_TIFF=no LIBTIFF= @@ -3341,7 +3341,7 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then fi AC_SUBST(LIBTIFF) -### Use -lgif or -lungif if available, unless `--with-gif=no'. +### Use -lgif or -lungif if available, unless '--with-gif=no'. ### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. HAVE_GIF=no LIBGIF= @@ -3399,7 +3399,7 @@ as options to configure]) fi fi -### Use -lgpm if available, unless `--with-gpm=no'. +### Use -lgpm if available, unless '--with-gpm=no'. HAVE_GPM=no LIBGPM= if test "${with_gpm}" != "no"; then @@ -3537,7 +3537,7 @@ if test "${with_xml2}" != "no"; then CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2" AC_CHECK_HEADER(libxml/HTMLparser.h, [AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, , - [#include <libxml/HTMLparser.h>])]) + [#include <libxml/HTMLparser.h>])]) CPPFLAGS="$SAVE_CPPFLAGS" if test "${HAVE_LIBXML2}" = "yes"; then LIBXML2_CFLAGS="-I'$xcsdkdir/usr/include/libxml2'" @@ -3581,7 +3581,7 @@ fi AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no) if test $have_mail = yes; then LIBS_MAIL=-lmail - AC_DEFINE(HAVE_LIBMAIL, 1, [Define to 1 if you have the `mail' library (-lmail).]) + AC_DEFINE(HAVE_LIBMAIL, 1, [Define to 1 if you have the 'mail' library (-lmail).]) OLD_LIBS=$LIBS LIBS="$LIBS_MAIL $LIBS" @@ -3594,7 +3594,7 @@ dnl Debian, at least: AC_CHECK_LIB(lockfile, maillock, have_lockfile=yes, have_lockfile=no) if test $have_lockfile = yes; then LIBS_MAIL=-llockfile - AC_DEFINE(HAVE_LIBLOCKFILE, 1, [Define to 1 if you have the `lockfile' library (-llockfile).]) + AC_DEFINE(HAVE_LIBLOCKFILE, 1, [Define to 1 if you have the 'lockfile' library (-llockfile).]) else # If we have the shared liblockfile, assume we must use it for mail # locking (e.g. Debian). If we couldn't link against liblockfile @@ -3606,7 +3606,7 @@ else if test $ac_cv_prog_liblockfile = yes; then AC_MSG_ERROR([Shared liblockfile found but can't link against it. This probably means that movemail could lose mail. -There may be a `development' package to install containing liblockfile.]) +There may be a 'development' package to install containing liblockfile.]) fi fi AC_CHECK_HEADERS_ONCE(maillock.h) @@ -3624,12 +3624,12 @@ case "$opsys" in ## On GNU/Linux systems, both methods are used by various mail programs. ## I assume most people are using newer mailers that have heard of flock. ## Change this if you need to. - ## Debian contains a patch which says: ``On Debian/GNU/Linux systems, + ## Debian contains a patch which says: "On Debian/GNU/Linux systems, ## configure gets the right answers, and that means *NOT* using flock. ## Using flock is guaranteed to be the wrong thing. See Debian Policy - ## for details.'' and then uses `#ifdef DEBIAN'. Unfortunately the + ## for details." and then uses '#ifdef DEBIAN'. Unfortunately the ## Debian maintainer hasn't provided a clean fix for Emacs. - ## movemail.c will use `maillock' when MAILDIR, HAVE_LIBMAIL and + ## movemail.c will use 'maillock' when MAILDIR, HAVE_LIBMAIL and ## HAVE_MAILLOCK_H are defined, so the following appears to be the ## correct logic. -- fx ## We must check for HAVE_LIBLOCKFILE too, as movemail does. @@ -3689,7 +3689,7 @@ AC_CACHE_CHECK([for __builtin_unwind_init], emacs_cv_func___builtin_unwind_init=no)]) if test $emacs_cv_func___builtin_unwind_init = yes; then AC_DEFINE(HAVE___BUILTIN_UNWIND_INIT, 1, - [Define to 1 if you have the `__builtin_unwind_init' function.]) + [Define to 1 if you have the '__builtin_unwind_init' function.]) fi AC_CHECK_HEADERS_ONCE(sys/un.h) @@ -3748,7 +3748,7 @@ else fi AC_MSG_RESULT([$msg]) if test "X$msg" = Xno; then - AC_MSG_ERROR([The required function `tputs' was not found in any library. + AC_MSG_ERROR([The required function 'tputs' was not found in any library. The following libraries were tried (in order): libtinfo, libncurses, libterminfo, libtermcap, libcurses Please try installing whichever of these libraries is most appropriate @@ -4033,7 +4033,7 @@ LIBS="$LIBS $GFILENOTIFY_LIBS" AC_MSG_CHECKING([whether GLib is linked in]) AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include <glib.h> - ]], + ]], [[g_print ("Hello world");]])], [links_glib=yes], [links_glib=no]) @@ -4284,15 +4284,15 @@ case $opsys in esac -dnl If the system's imake configuration file defines `NeedWidePrototypes' -dnl as `NO', we must define NARROWPROTO manually. Such a define is -dnl generated in the Makefile generated by `xmkmf'. If we don't define +dnl If the system's imake configuration file defines 'NeedWidePrototypes' +dnl as 'NO', we must define NARROWPROTO manually. Such a define is +dnl generated in the Makefile generated by 'xmkmf'. If we don't define dnl NARROWPROTO, we will see the wrong function prototypes for X functions dnl taking float or double parameters. case $opsys in cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd) AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration - file defines `NeedWidePrototypes' as `NO'.]) + file defines 'NeedWidePrototypes' as 'NO'.]) ;; esac @@ -4877,8 +4877,8 @@ AC_CACHE_CHECK([for struct alignment], [emacs_cv_struct_alignment], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <stddef.h> - struct __attribute__ ((aligned (8))) s { char c; }; - struct t { char c; struct s s; }; + struct __attribute__ ((aligned (8))) s { char c; }; + struct t { char c; struct s s; }; char verify[offsetof (struct t, s) == 8 ? 1 : -1]; ]])], [emacs_cv_struct_alignment=yes], @@ -5116,7 +5116,7 @@ else fi echo " -Configured for \`${canonical}'. +Configured for '${canonical}'. Where should the build process find the source code? ${srcdir} What compiler should emacs be built with? ${CC} ${CFLAGS} @@ -5241,7 +5241,7 @@ AC_CONFIG_FILES([$srcdir/doc/man/emacs.1]) dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES. dnl You _can_ use that variable in AC_CONFIG_FILES, so long as any directory dnl using automake (ie lib/) is explicitly listed and not "hidden" in a variable -dnl (else you get "no `Makefile.am' found for any configure output"). +dnl (else you get "no 'Makefile.am' found for any configure output"). dnl This will work, but you get a config.status that is not quite right dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). dnl That doesn't have any obvious consequences for Emacs, but on the whole @@ -5281,9 +5281,9 @@ dnl rather than just letting configure generate it from epaths.in. dnl One reason is that the various paths are not fully expanded (see above); dnl eg gamedir=${prefix}/var/games/emacs. dnl Secondly, the GNU Coding standards require that one should be able -dnl to run `make prefix=/some/where/else' and override the values set -dnl by configure. This also explains the `move-if-change' test and -dnl the use of force in the `epaths-force' rule in Makefile.in. +dnl to run 'make prefix=/some/where/else' and override the values set +dnl by configure. This also explains the 'move-if-change' test and +dnl the use of force in the 'epaths-force' rule in Makefile.in. AC_CONFIG_COMMANDS([src/epaths.h], [ if test "${opsys}" = "mingw32"; then ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 |