fi
cc_target=`$cc -v 2>&1 | sed -n 's/Target: //p'`
case "$cc_target" in
-- *-*) host=$cc_target
++ *-*) host=$cc_target
;;
-- "") AC_MSG_ERROR([Impossible to obtain $cc compiler target.
++ "") AC_MSG_ERROR([Impossible to obtain $cc compiler target.
Please explicitly provide --host.])
-- ;;
++ ;;
*) AC_MSG_WARN([Compiler reported non-standard target.
Defaulting to $host.])
-- ;;
++ ;;
esac
AC_MSG_RESULT([$host])
fi
AC_ARG_ENABLE(ns-self-contained,
[AS_HELP_STRING([--disable-ns-self-contained],
-- [disable self contained build under NeXTstep])],
++ [disable self contained build under NeXTstep])],
EN_NS_SELF_CONTAINED=$enableval,
EN_NS_SELF_CONTAINED=yes)
locallisppathset=no
AC_ARG_ENABLE(locallisppath,
[AS_HELP_STRING([--enable-locallisppath=PATH],
-- [directories Emacs should search for lisp files specific
++ [directories Emacs should search for lisp files specific
to this site])],
if test "${enableval}" = "no"; then
locallisppath=
Flags are: stringbytes, stringoverrun, stringfreelist,
xmallocoverrun, conslist, glyphs])],
[ac_checking_flags="${enableval}"],[])
--IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$IFS,"
++IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$IFS,"
for check in $ac_checking_flags
do
case $check in
yes) ac_enable_checking=1 ;;
no) ac_enable_checking= ;
ac_gc_check_stringbytes= ;
-- ac_gc_check_string_overrun= ;
-- ac_gc_check_string_free_list= ;
-- ac_xmalloc_overrun= ;
-- ac_gc_check_cons_list= ;
++ ac_gc_check_string_overrun= ;
++ ac_gc_check_string_free_list= ;
++ ac_xmalloc_overrun= ;
++ ac_gc_check_cons_list= ;
ac_glyphs_debug= ;;
all) ac_enable_checking=1 ;
ac_gc_check_stringbytes=1 ;
-- ac_gc_check_string_overrun=1 ;
-- ac_gc_check_string_free_list=1 ;
-- ac_xmalloc_overrun=1 ;
-- ac_gc_check_cons_list=1 ;
++ ac_gc_check_string_overrun=1 ;
++ ac_gc_check_string_free_list=1 ;
++ ac_xmalloc_overrun=1 ;
++ ac_gc_check_cons_list=1 ;
ac_glyphs_debug=1 ;;
# these enable particular checks
stringbytes) ac_gc_check_stringbytes=1 ;;
AC_ARG_ENABLE(check-lisp-object-type,
[AS_HELP_STRING([--enable-check-lisp-object-type],
-- [enable compile time checks for the Lisp_Object data type.
++ [enable compile time checks for the Lisp_Object data type.
This is useful for development for catching certain types of bugs.])],
if test "${enableval}" != "no"; then
AC_DEFINE(CHECK_LISP_OBJECT_TYPE, 1,
AC_ARG_ENABLE(profiling,
[AS_HELP_STRING([--enable-profiling],
[build emacs with low-level, gprof profiling support.
-- Mainly useful for debugging Emacs itself. May not work on
-- all platforms. Stops profiler.el working.])],
++ Mainly useful for debugging Emacs itself. May not work on
++ all platforms. Stops profiler.el working.])],
[ac_enable_profiling="${enableval}"],[])
if test x$ac_enable_profiling != x ; then
PROFILING_CFLAGS="-DPROFILING=1 -pg"
test -z "$CFLAGS" || CFLAGS="$CFLAGS "
CFLAGS=${CFLAGS}-O
AC_CACHE_CHECK([whether $CC accepts -O],
-- [emacs_cv_prog_cc_o],
++ [emacs_cv_prog_cc_o],
[AC_LINK_IFELSE([AC_LANG_PROGRAM()],
[emacs_cv_prog_cc_o=yes],
[emacs_cv_prog_cc_o=no])])
AC_ARG_ENABLE([gcc-warnings],
[AS_HELP_STRING([--enable-gcc-warnings],
-- [turn on lots of GCC warnings/errors. This is intended for
++ [turn on lots of GCC warnings/errors. This is intended for
developers, and may generate false alarms when used
with older or non-GNU development tools.])],
[case $enableval in
#ifndef __clang__
error "not clang";
#endif
-- ]])],
++ ]])],
[emacs_cv_clang=yes],
[emacs_cv_clang=no])])
nw="$nw -Winline" # OK to ignore 'inline'
nw="$nw -Wjump-misses-init" # We sometimes safely jump over init.
nw="$nw -Wstrict-overflow" # OK to optimize assuming that
-- # signed overflow has undefined behavior
++ # signed overflow has undefined behavior
nw="$nw -Wsync-nand" # irrelevant here, and provokes ObjC warning
nw="$nw -Wunsafe-loop-optimizations" # OK to suppress unsafe optimizations
nw="$nw -Wbad-function-cast" # These casts are no worse than others.
[/* Enable compile-time and run-time bounds-checking, and some warnings,
without upsetting glibc 2.15+. */
#if (defined GNULIB_PORTCHECK && !defined _FORTIFY_SOURCE \
-- && defined __OPTIMIZE__ && __OPTIMIZE__)
++ && defined __OPTIMIZE__ && __OPTIMIZE__)
# define _FORTIFY_SOURCE 2
#endif
])
AC_ARG_ENABLE(link-time-optimization,
[AS_HELP_STRING([--enable-link-time-optimization],
-- [build emacs with link-time optimization.
++ [build emacs with link-time optimization.
This requires GCC 4.5.0 or later, or clang.
(Note that clang support is experimental - see INSTALL.)
It also makes Emacs harder to debug, and when we tried it
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $LTO"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-- [ac_lto_supported=yes], [ac_lto_supported=no])
-- CFLAGS="$old_CFLAGS"
++ [ac_lto_supported=yes], [ac_lto_supported=no])
++ CFLAGS="$old_CFLAGS"
fi
AC_MSG_RESULT([$ac_lto_supported])
if test "$ac_lto_supported" = "yes"; then
ARFLAGS="cru --plugin $GOLD_PLUGIN"
RANLIB="$RANLIB --plugin $GOLD_PLUGIN"
else
-- dnl The following is needed for GCC 4.9.0. The GCC 4.9.0 release notes
-- dnl suggest that instead of -ffat-lto-objects we should use gcc-ar and
-- dnl gcc-ranlib in place of ar and ranlib, but gcc-ar makes /usr/bin/ar
-- dnl dump core on Fedora 20, so play it safe for now.
-- gl_COMPILER_OPTION_IF([-ffat-lto-objects],
-- [CFLAGS="$CFLAGS -ffat-lto-objects"])
++ dnl The following is needed for GCC 4.9.0. The GCC 4.9.0 release notes
++ dnl suggest that instead of -ffat-lto-objects we should use gcc-ar and
++ dnl gcc-ranlib in place of ar and ranlib, but gcc-ar makes /usr/bin/ar
++ dnl dump core on Fedora 20, so play it safe for now.
++ gl_COMPILER_OPTION_IF([-ffat-lto-objects],
++ [CFLAGS="$CFLAGS -ffat-lto-objects"])
fi
fi
fi)
CFLAGS="$ALSA_CFLAGS $CFLAGS"
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=yes,
++ 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)
-- 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
-- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
++ [[snd_lib_error_set_handler (0);]])],
++ emacs_alsa_subdir=yes,
++ 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
++ ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
fi
CFLAGS="$SAVE_CFLAGS"
dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
dnl Adjust the --with-sound help text if you change this.
gnu-linux|freebsd|netbsd|mingw32|cygwin)
-- AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.])
-- HAVE_SOUND=yes
-- ;;
++ AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.])
++ HAVE_SOUND=yes
++ ;;
esac
fi
AC_MSG_CHECKING(if personality LINUX32 can be set)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
-- emacs_cv_personality_linux32=yes,
++ emacs_cv_personality_linux32=yes,
emacs_cv_personality_linux32=no)
AC_MSG_RESULT($emacs_cv_personality_linux32)
if test $emacs_cv_personality_linux32 = yes; then
AC_DEFINE(HAVE_PERSONALITY_LINUX32, 1,
-- [Define to 1 if personality LINUX32 can be set.])
++ [Define to 1 if personality LINUX32 can be set.])
fi
# Note that Solaris has sys/sysinfo.h which defines struct
if test "$ac_cv_header_sys_sysinfo_h" = yes; then
AC_MSG_CHECKING([if Linux sysinfo may be used])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]],
-- [[struct sysinfo si;
-- si.totalram = 0;
-- sysinfo (&si)]])],
++ [[struct sysinfo si;
++ si.totalram = 0;
++ sysinfo (&si)]])],
emacs_cv_linux_sysinfo=yes, emacs_cv_linux_sysinfo=no)
AC_MSG_RESULT($emacs_cv_linux_sysinfo)
if test $emacs_cv_linux_sysinfo = yes; then
AC_DEFINE([HAVE_LINUX_SYSINFO], 1, [Define to 1 if you have Linux sysinfo function.])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]],
-- [[struct sysinfo si; return si.mem_unit]])],
++ [[struct sysinfo si; return si.mem_unit]])],
AC_DEFINE(LINUX_SYSINFO_UNIT, 1,
-- [Define to 1 if Linux sysinfo sizes are in multiples of mem_unit bytes.]))
++ [Define to 1 if Linux sysinfo sizes are in multiples of mem_unit bytes.]))
fi
fi
AC_CHECK_HEADERS(term.h, , , -)
AC_HEADER_TIME
AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h>
-- ]])
++ ]])
if test $ac_cv_have_decl_sys_siglist != yes; then
# For Tru64, at least:
AC_CHECK_DECLS([__sys_siglist], [], [], [[#include <signal.h>
-- ]])
++ ]])
fi
AC_HEADER_SYS_WAIT
if test $emacs_cv_objc_exceptions = yes; then
dnl _NATIVE_OBJC_EXCEPTIONS is used by the GNUstep headers.
AC_DEFINE(_NATIVE_OBJC_EXCEPTIONS, 1,
-- [Define if GNUstep uses ObjC exceptions.])
++ [Define if GNUstep uses ObjC exceptions.])
GNU_OBJC_CFLAGS="-fobjc-exceptions"
fi
fi
if test "${NS_IMPL_COCOA}" = "yes"; then
AC_MSG_CHECKING([for OSX 10.6 or newer])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <AppKit/AppKit.h>],
-- [
++ [
#ifdef MAC_OS_X_VERSION_MAX_ALLOWED
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
; /* OK */
case "${opsys}" in
cygwin)
AC_CHECK_HEADER([windows.h], [HAVE_W32=yes],
-- [AC_MSG_ERROR(['--with-w32' was specified, but windows.h
-- cannot be found.])])
++ [AC_MSG_ERROR(['--with-w32' was specified, but windows.h
++ cannot be found.])])
;;
mingw32)
## Using --with-w32 with MinGW is a no-op, but we allow it.
AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for w32 build.])
fi
AC_CHECK_TOOL(WINDRES, [windres],
-- [AC_MSG_ERROR([No resource compiler found.])])
++ [AC_MSG_ERROR([No resource compiler found.])])
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
EMACSRES="emacs.res"
athena | lucid ) USE_X_TOOLKIT=LUCID ;;
motif ) USE_X_TOOLKIT=MOTIF ;;
gtk ) with_gtk=yes
-- term_header=gtkutil.h
++ term_header=gtkutil.h
dnl Don't set this for GTK. A lot of tests below assumes Xt when
dnl USE_X_TOOLKIT is set.
-- USE_X_TOOLKIT=none ;;
++ USE_X_TOOLKIT=none ;;
gtk2 ) with_gtk2=yes
-- term_header=gtkutil.h
-- USE_X_TOOLKIT=none ;;
++ term_header=gtkutil.h
++ USE_X_TOOLKIT=none ;;
gtk3 ) with_gtk3=yes
-- term_header=gtkutil.h
-- USE_X_TOOLKIT=none ;;
++ term_header=gtkutil.h
++ USE_X_TOOLKIT=none ;;
no ) USE_X_TOOLKIT=none ;;
dnl If user did not say whether to use a toolkit, make this decision later:
dnl use the toolkit if we have gtk, or X11R5 or newer.
AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
if test "$HAVE_XSERVER" = true ||
test -n "$DISPLAY" ||
- test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
- AC_MSG_ERROR([You seem to be running X, but no X development libraries
+ {
- for emacs_libX11 in /usr/lib/libX11.*; do break; done
- test "$emacs_libX11" != '/usr/lib/libX11.*'
++ for emacs_libX11 in /usr/lib/libX11.*; do break; done
++ test "$emacs_libX11" != '/usr/lib/libX11.*'
+ }
+ then
- AC_MSG_ERROR([You seem to be running X, but no X development libraries
++ AC_MSG_ERROR([You seem to be running X, but no X development libraries
were found. You should install the relevant development files for X
and for the toolkit you want, such as Gtk+ or Motif. Also make
sure you have development files for image handling, i.e.
if test "${xgnu_linux_second_failure}" = "yes"; then
# If we get the same failure with -b, there is no use adding -b.
# So leave it out. This plays safe.
-- AC_MSG_RESULT(no)
++ AC_MSG_RESULT(no)
else
LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
-- AC_MSG_RESULT(yes)
++ AC_MSG_RESULT(yes)
fi
CPPFLAGS=$OLD_CPPFLAGS
LIBS=$OLD_LIBS
case "$opsys" in
sol2-*) : ;;
*) AC_DEFINE(HAVE_X11R6_XIM, 1,
-- [Define if you have usable X11R6-style XIM support.])
-- ;;
++ [Define if you have usable X11R6-style XIM support.])
++ ;;
esac
else
AC_MSG_RESULT(before 6)
dnl AC_CHECK_DECL checks for a macro, so check for GTK_TYPE_FILE_SELECTION.
HAVE_GTK_FILE_SELECTION=no
AC_CHECK_DECL(GTK_TYPE_FILE_SELECTION, HAVE_GTK_FILE_SELECTION=yes,
-- HAVE_GTK_FILE_SELECTION=no, [AC_INCLUDES_DEFAULT
++ HAVE_GTK_FILE_SELECTION=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_FILE_SELECTION" = yes; then
AC_CHECK_FUNCS(gtk_file_selection_new)
dnl Same as above for gtk_handle_box.
HAVE_GTK_HANDLE_BOX=no
AC_CHECK_DECL(GTK_TYPE_HANDLE_BOX, HAVE_GTK_HANDLE_BOX=yes,
-- HAVE_GTK_HANDLE_BOX=no, [AC_INCLUDES_DEFAULT
++ HAVE_GTK_HANDLE_BOX=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_HANDLE_BOX" = yes; then
AC_CHECK_FUNCS(gtk_handle_box_new)
dnl Same as above for gtk_tearoff_menu_item.
HAVE_GTK_TEAROFF_MENU_ITEM=no
AC_CHECK_DECL(GTK_TYPE_TEAROFF_MENU_ITEM, HAVE_GTK_TEAROFF_MENU_ITEM=yes,
-- HAVE_GTK_TEAROFF_MENU_ITEM=no, [AC_INCLUDES_DEFAULT
++ HAVE_GTK_TEAROFF_MENU_ITEM=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then
AC_CHECK_FUNCS(gtk_tearoff_menu_item_new)
dnl Check for functions introduced in 2.14 and later.
AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
-- gtk_dialog_get_action_area gtk_widget_get_sensitive \
-- gtk_widget_get_mapped gtk_adjustment_get_page_size \
-- gtk_orientable_set_orientation \
++ gtk_dialog_get_action_area gtk_widget_get_sensitive \
++ gtk_widget_get_mapped gtk_adjustment_get_page_size \
++ gtk_orientable_set_orientation \
gtk_window_set_has_resize_grip)
term_header=gtkutil.h
fi
- AC_DEFINE([HAVE_WEBKIT_OSR], 1,
+
+HAVE_XWIDGETS=no
+HAVE_WEBKIT=no
+HAVE_GIR=no
+XWIDGETS_OBJ=
+if test "$with_xwidgets" != "no" && test "$USE_GTK_TOOLKIT" = "GTK3" &&
+ test "$window_system" != "none"
+then
+ HAVE_XWIDGETS=yes
+ AC_DEFINE([HAVE_XWIDGETS], 1, [Define to 1 if you have xwidgets support.])
+
+ dnl xwidgets
+ dnl - enable only if GTK3 is enabled, and we have a window system
+ dnl - check for webkit and gobject introspection
+ dnl webkit version for gtk3.
+ WEBKIT_REQUIRED=1.4.0
+ WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED"
+
+ if test "${with_gtk3}" = "yes"; then
+ PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+ if test $HAVE_WEBKIT = yes; then
++ AC_DEFINE([HAVE_WEBKIT_OSR], 1,
+ [Define to 1 if you have webkit_osr support.])
+ fi
+ fi
+
+ GIR_REQUIRED=1.32.1
+ GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED"
+ PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no)
+ if test $HAVE_GIR = yes; then
+ AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.])
+ fi
+ XWIDGETS_OBJ=xwidget.o
+fi
+AC_SUBST(XWIDGETS_OBJ)
+
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
AC_CHECK_FUNCS(dbus_watch_get_unix_fd \
dbus_type_is_valid \
dbus_validate_bus_name \
-- dbus_validate_path \
++ dbus_validate_path \
dbus_validate_interface \
dbus_validate_member)
LIBS=$OLD_LIBS
LIBS="$LIBS $GSETTINGS_LIBS"
AC_MSG_CHECKING([whether GSettings is in gio])
AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM(
++ [AC_LANG_PROGRAM(
[[/* Check that gsettings really is present. */
#include <glib-object.h>
#include <gio/gio.h>
AC_MSG_RESULT([$HAVE_GSETTINGS])
if test "$HAVE_GSETTINGS" = "yes"; then
-- AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
++ AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
SETTINGS_LIBS="$GSETTINGS_LIBS"
fi
#include <X11/Xaw3d/Simple.h>]],
[[]])],
[AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb,
-- emacs_cv_xaw3d=yes, emacs_cv_xaw3d=no)],
++ emacs_cv_xaw3d=yes, emacs_cv_xaw3d=no)],
emacs_cv_xaw3d=no)])
else
emacs_cv_xaw3d=no
HAVE_XAW3D=yes
LUCID_LIBW=-lXaw3d
AC_DEFINE(HAVE_XAW3D, 1,
-- [Define to 1 if you have the Xaw3d library (-lXaw3d).])
++ [Define to 1 if you have the Xaw3d library (-lXaw3d).])
else
AC_MSG_CHECKING(for xaw3d)
AC_MSG_RESULT(no)
/* If we're not using GCC, it's probably not XFree86, and this is
probably right, but we can't use something like --pedantic-errors. */
extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*,
-- char*, XIMProc, XPointer*);
++ char*, XIMProc, XPointer*);
#endif
(void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback,
client_data);]])],
[emacs_cv_arg6_star=yes])
AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6,
-- [Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
++ [Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
either XPointer or XPointer*.])dnl
if test "$emacs_cv_arg6_star" = yes; then
AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
LIBS="$XFT_LIBS $LIBS"
AC_CHECK_HEADER(X11/Xft/Xft.h,
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS) , ,
-- [[#include <X11/X.h>]])
++ [[#include <X11/X.h>]])
if test "${HAVE_XFT}" = "yes"; then
AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
], HAVE_XPM=no, HAVE_XPM=yes)
if test "${HAVE_XPM}" = "yes"; then
-- REAL_CPPFLAGS="$REAL_CPPFLAGS -I/usr/include/noX"
++ REAL_CPPFLAGS="$REAL_CPPFLAGS -I/usr/include/noX"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
-- CPPFLAGS="$SAVE_CPPFLAGS"
-- LDFLAGS="$SAVE_LDFLAGS"
++ CPPFLAGS="$SAVE_CPPFLAGS"
++ LDFLAGS="$SAVE_LDFLAGS"
fi
fi
fi
for emacs_cv_jpeglib in yes -ljpeg no; do
case $emacs_cv_jpeglib in
yes) ;;
-- no) break;;
++ no) break;;
*) LIBS="$LIBS $emacs_cv_jpeglib";;
esac
AC_LINK_IFELSE(
AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
fi
elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
-- || test "${HAVE_W32}" = "yes"; then
++ || test "${HAVE_W32}" = "yes"; then
AC_CHECK_HEADER(gif_lib.h,
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs, but version 5.0 removes EGifPutExtensionLast.
[AC_CHECK_LIB(gif, GifMakeMapObject, HAVE_GIF=yes,
-- [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])])
++ [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])])
if test "$HAVE_GIF" = yes; then
LIBGIF=-lgif
if test "${HAVE_LIBXML2}" = "yes"; then
if test "${opsys}" != "mingw32"; then
AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no,
-- [$LIBXML2_LIBS])
++ [$LIBXML2_LIBS])
else
LIBXML2_LIBS=""
fi
dnl This works for files generally, not just executables.
dnl Should we look elsewhere for it? Maybe examine /etc/ld.so.conf?
AC_CHECK_PROG(liblockfile, liblockfile.so, yes, no,
-- /usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH)
++ /usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH)
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.
else
AC_CHECK_LIB(des, des_cbc_encrypt, have_des=yes, have_des=no)
if test $have_des = yes; then
-- DESLIB=-ldes
-- LIBS="$DESLIB $LIBS"
++ DESLIB=-ldes
++ LIBS="$DESLIB $LIBS"
fi
fi
AC_CHECK_LIB(krb4, krb_get_cred, have_krb4=yes, have_krb4=no)
else
AC_CHECK_LIB(krb, krb_get_cred, have_krb=yes, have_krb=no)
if test $have_krb = yes; then
-- KRB4LIB=-lkrb
-- LIBS="$KRB4LIB $LIBS"
++ KRB4LIB=-lkrb
++ LIBS="$KRB4LIB $LIBS"
fi
fi
fi
if test "${with_kerberos5}" != no; then
AC_CHECK_HEADERS(krb5.h,
[AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
-- [#include <krb5.h>])])
++ [#include <krb5.h>])])
else
AC_CHECK_HEADERS(krb.h,,
[AC_CHECK_HEADERS(kerberosIV/krb.h,,
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname = 0; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); if (grantpt (fd) != -1 && unlockpt (fd) != -1) ptyname = ptsname(fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (!ptyname) { emacs_close (fd); return -1; } snprintf (pty_name, PTY_NAME_SIZE, "%s", ptyname); }])
dnl if HAVE_POSIX_OPENPT
if test "x$ac_cv_func_posix_openpt" = xyes; then
-- AC_DEFINE(PTY_OPEN, [do { fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY); if (fd < 0 && errno == EINVAL) fd = posix_openpt (O_RDWR | O_NOCTTY); } while (false)])
-- AC_DEFINE(PTY_NAME_SPRINTF, [])
++ AC_DEFINE(PTY_OPEN, [do { fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY); if (fd < 0 && errno == EINVAL) fd = posix_openpt (O_RDWR | O_NOCTTY); } while (false)])
++ AC_DEFINE(PTY_NAME_SPRINTF, [])
dnl if HAVE_GETPT
elif test "x$ac_cv_func_getpt" = xyes; then
-- AC_DEFINE(PTY_OPEN, [fd = getpt ()])
-- AC_DEFINE(PTY_NAME_SPRINTF, [])
++ AC_DEFINE(PTY_OPEN, [fd = getpt ()])
++ AC_DEFINE(PTY_NAME_SPRINTF, [])
else
-- AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");])
++ AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");])
fi
else
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
# error "not ia64"
#endif
]], [[]])], AC_DEFINE(GC_MARK_SECONDARY_STACK(),
-- [do { extern void *__libc_ia64_register_backing_store_base; __builtin_ia64_flushrs (); mark_memory (__libc_ia64_register_backing_store_base, __builtin_ia64_bsp ());} while (false)],
-- [Mark a secondary stack, like the register stack on the ia64.]), [])
++ [do { extern void *__libc_ia64_register_backing_store_base; __builtin_ia64_flushrs (); mark_memory (__libc_ia64_register_backing_store_base, __builtin_ia64_bsp ());} while (false)],
++ [Mark a secondary stack, like the register stack on the ia64.]), [])
;;
hpux*)
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <setjmp.h>
-- #ifdef __MINGW32__
-- # define _longjmp longjmp
-- #endif
++ #ifdef __MINGW32__
++ # define _longjmp longjmp
++ #endif
]],
[[jmp_buf j;
if (! _setjmp (j))
[[#include <setjmp.h>
]],
[[sigjmp_buf j;
-- if (! sigsetjmp (j, 1))
++ if (! sigsetjmp (j, 1))
siglongjmp (j, 1);]])],
[emacs_cv_func_sigsetjmp=yes],
[emacs_cv_func_sigsetjmp=no])])
if test -n "${term_header}"; then
AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
-- [Define to the header for the built-in window system.])
++ [Define to the header for the built-in window system.])
fi
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
MOTIF_LIBW=-lXm
case "$opsys" in
gnu-linux)
--
## Paul Abrahams <abrahams at equinox.shaysnet.com> says this is needed.
-- MOTIF_LIBW="$MOTIF_LIBW -lXpm"
-- ;;
++ ## Paul Abrahams <abrahams at equinox.shaysnet.com> says this is needed.
++ MOTIF_LIBW="$MOTIF_LIBW -lXpm"
++ ;;
unixware)
-- ## Richard Anthony Ryan <ryanr at ellingtn.ftc.nrcs.usda.gov>
-- ## says -lXimp is needed in UNIX_SV ... 4.2 1.1.2.
-- MOTIF_LIBW="MOTIF_LIBW -lXimp"
-- ;;
++ ## Richard Anthony Ryan <ryanr at ellingtn.ftc.nrcs.usda.gov>
++ ## says -lXimp is needed in UNIX_SV ... 4.2 1.1.2.
++ MOTIF_LIBW="MOTIF_LIBW -lXimp"
++ ;;
aix4-2)
-- ## olson@mcs.anl.gov says -li18n is needed by -lXm.
-- MOTIF_LIBW="$MOTIF_LIBW -li18n"
-- ;;
++ ## olson@mcs.anl.gov says -li18n is needed by -lXm.
++ MOTIF_LIBW="$MOTIF_LIBW -li18n"
++ ;;
esac
MOTIF_LIBW="$MOTIF_LIBW $LIBXP"
fi
if test "$HAVE_NS" = "yes"; then
libs_nsgui="-framework AppKit"
if test "$NS_IMPL_COCOA" = "yes"; then
-- libs_nsgui="$libs_nsgui -framework IOKit"
++ libs_nsgui="$libs_nsgui -framework IOKit"
fi
else
libs_nsgui=
esac
case $opt in
X_TOOLKIT)
-- case $val in
-- GTK*|LUCID|MOTIF) opt=$val ;;
-- *) continue ;;
-- esac
++ case $val in
++ GTK*|LUCID|MOTIF) opt=$val ;;
++ *) continue ;;
++ esac
;;
esac
AS_VAR_APPEND([emacs_config_features], ["$optsep$opt"])
AC_DEFINE_UNQUOTED(EMACS_CONFIG_FEATURES, "${emacs_config_features}",
[Summary of some of the main features enabled by configure.])
- echo " Does Emacs use -lXaw3d? ${HAVE_XAW3D}"
- echo " Does Emacs use -lXpm? ${HAVE_XPM}"
- echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
- echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
- echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF"
- echo " Does Emacs use a png library? ${HAVE_PNG} $LIBPNG"
- echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
- echo " Does Emacs use cairo? ${USE_CAIRO}"
- echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}"
-
- echo " Does Emacs support sound? ${HAVE_SOUND}"
-
- echo " Does Emacs use -lgpm? ${HAVE_GPM}"
- echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
- echo " Does Emacs use -lgconf? ${HAVE_GCONF}"
- echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}"
- echo " Does Emacs use a file notification library? ${NOTIFY_SUMMARY}"
- echo " Does Emacs use access control lists? ${ACL_SUMMARY}"
- echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}"
- echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}"
- echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}"
-
- echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"
- echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}"
- echo " Does Emacs use -lotf? ${HAVE_LIBOTF}"
- echo " Does Emacs use -lxft? ${HAVE_XFT}"
- echo " Does Emacs directly use zlib? ${HAVE_ZLIB}"
-
- echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
-
- echo " Does Emacs support Xwidgets? ${HAVE_XWIDGETS}"
- echo " Does xwidgets support webkit(requires gtk3)? ${HAVE_WEBKIT}"
- echo " Does xwidgets support gobject introspection? ${HAVE_GIR}"
- echo
+ AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D}
+ Does Emacs use -lXpm? ${HAVE_XPM}
+ Does Emacs use -ljpeg? ${HAVE_JPEG}
+ Does Emacs use -ltiff? ${HAVE_TIFF}
+ Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF
+ Does Emacs use a png library? ${HAVE_PNG} $LIBPNG
+ Does Emacs use -lrsvg-2? ${HAVE_RSVG}
+ Does Emacs use cairo? ${USE_CAIRO}
+ Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}
+ Does Emacs support sound? ${HAVE_SOUND}
+ Does Emacs use -lgpm? ${HAVE_GPM}
+ Does Emacs use -ldbus? ${HAVE_DBUS}
+ Does Emacs use -lgconf? ${HAVE_GCONF}
+ Does Emacs use GSettings? ${HAVE_GSETTINGS}
+ Does Emacs use a file notification library? ${NOTIFY_SUMMARY}
+ Does Emacs use access control lists? ${ACL_SUMMARY}
+ Does Emacs use -lselinux? ${HAVE_LIBSELINUX}
+ Does Emacs use -lgnutls? ${HAVE_GNUTLS}
+ Does Emacs use -lxml2? ${HAVE_LIBXML2}
+ Does Emacs use -lfreetype? ${HAVE_FREETYPE}
+ Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}
+ Does Emacs use -lotf? ${HAVE_LIBOTF}
+ Does Emacs use -lxft? ${HAVE_XFT}
+ Does Emacs directly use zlib? ${HAVE_ZLIB}
+ Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}
++ Does Emacs support Xwidgets? ${HAVE_XWIDGETS}
++ Does xwidgets support webkit(requires gtk3)? ${HAVE_WEBKIT}
++ Does xwidgets support gobject introspection? ${HAVE_GIR}
+ "])
if test -n "${EMACSDATA}"; then
- echo " Environment variable EMACSDATA set to: $EMACSDATA"
+ AS_ECHO([" Environment variable EMACSDATA set to: $EMACSDATA"])
fi
if test -n "${EMACSDOC}"; then
- echo " Environment variable EMACSDOC set to: $EMACSDOC"
+ AS_ECHO([" Environment variable EMACSDOC set to: $EMACSDOC"])
fi
echo
if test "${opsys}" = "cygwin"; then
case `uname -r` in
1.5.*) AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
-- echo
++ echo
;;
esac
fi
projects / emacs.git / commitdiff