X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7c82f3e23e37cc848a38b1f8be7149fd672a6393..acbfe54c07f24929f584ba9e29baf4401ee4bfd9:/configure.in diff --git a/configure.in b/configure.in index 161ba74f94..69d1a1e5bd 100644 --- a/configure.in +++ b/configure.in @@ -4,9 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, -dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011 -dnl Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -164,7 +162,7 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping]) OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) -OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system]) +OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system]) OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support]) @@ -515,6 +513,17 @@ case "${canonical}" in CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" ;; + ia64*-hp-hpux1[1-9]* ) + machine=hp800 opsys=hpux11 + ## FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't + ## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811 + CANNOT_DUMP=yes + ;; + + hppa*-*-linux-gnu* ) + machine=hp800 opsys=gnu-linux + ;; + ## IBM machines rs6000-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 @@ -690,19 +699,6 @@ else test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi -### Use -Wno-pointer-sign if the compiler supports it -AC_MSG_CHECKING([whether gcc understands -Wno-pointer-sign]) -SAVE_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wno-pointer-sign" -AC_TRY_COMPILE([], [], has_option=yes, has_option=no,) -if test $has_option = yes; then - C_WARNINGS_SWITCH="-Wno-pointer-sign $C_WARNINGS_SWITCH" -fi -AC_MSG_RESULT($has_option) -CFLAGS="$SAVE_CFLAGS" -unset has_option -unset SAVE_CFLAGS - ### Use -Wdeclaration-after-statement if the compiler supports it AC_MSG_CHECKING([whether gcc understands -Wdeclaration-after-statement]) SAVE_CFLAGS="$CFLAGS" @@ -843,16 +839,16 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], CPP=`eval "echo $CPP"` -dnl Not used by any currently supported platform. dnl The function dump-emacs will not be defined and temacs will do dnl (load "loadup") automatically unless told otherwise. -CANNOT_DUMP=no +test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no case "$opsys" in - your-opsys-here) - CANNOT_DUMP=yes - AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.]) - ;; + your-opsys-here) CANNOT_DUMP=yes ;; esac + +test "$CANNOT_DUMP" = "yes" && \ + AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.]) + AC_SUBST(CANNOT_DUMP) @@ -975,7 +971,7 @@ case "$opsys" in hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; - sol2*) LIBS_SYSTEM="-lsocket -lnsl -lkstat" ;; + sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;; ## Motif needs -lgen. unixware) LIBS_SYSTEM="-lsocket -lnsl -lelf -lgen" ;; @@ -991,9 +987,6 @@ else CPPFLAGS="$C_SWITCH_SYSTEM $C_SWITCH_MACHINE $CPPFLAGS" fi -dnl For AC_FUNC_GETLOADAVG, at least: -AC_CONFIG_LIBOBJ_DIR(src) - dnl Do this early because it can frob feature test macros for Unix-98 &c. AC_SYS_LARGEFILE @@ -1510,6 +1503,7 @@ AC_SUBST(TEMACS_LDFLAGS2) ns_frag=/dev/null NS_OBJ= +NS_OBJC_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep @@ -1521,12 +1515,14 @@ if test "${HAVE_NS}" = yes; then prefix=${ns_appresdir} fi ns_frag=$srcdir/src/ns.mk - NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" + NS_OBJ="fontset.o fringe.o image.o" + NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" AC_SUBST(NS_OBJ) +AC_SUBST(NS_OBJC_OBJ) AC_SUBST(NS_SUPPORT) AC_SUBST(LIB_STANDARD) AC_SUBST_FILE(ns_frag) @@ -1997,7 +1993,8 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then #include #include ], [], - emacs_cv_xaw3d=yes, + [AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, + emacs_cv_xaw3d=yes, emacs_cv_xaw3d=no)], emacs_cv_xaw3d=no)]) else emacs_cv_xaw3d=no @@ -2247,15 +2244,23 @@ if test "${HAVE_X11}" = "yes"; then fi # "$HAVE_XFT" != no fi # "x${with_xft}" != "xno" - dnl For the "Does Emacs use" message at the end. + ## We used to allow building with FreeType and without Xft. + ## However, the ftx font backend driver is not in good shape. if test "$HAVE_XFT" != "yes"; then + dnl For the "Does Emacs use" message at the end. HAVE_XFT=no + HAVE_FREETYPE=no + else + dnl Strict linkers fail with + dnl ftfont.o: undefined reference to symbol 'FT_New_Face' + dnl if -lfreetype is not specified. + dnl The following is needed to set FREETYPE_LIBS. + PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no) + + test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype) fi - ## We used to allow building with FreeType and without Xft. - ## However, the ftx font backend driver is not in good shape. - HAVE_FREETYPE=$HAVE_XFT - HAVE_LIBOTF=no if test "${HAVE_FREETYPE}" = "yes"; then AC_DEFINE(HAVE_FREETYPE, 1, @@ -2655,18 +2660,15 @@ fi AC_CHECK_HEADERS(sys/un.h) -AC_FUNC_GETLOADAVG - AC_FUNC_FSEEKO AC_FUNC_GETPGRP # Configure gnulib. +gl_ASSERT_NO_GNULIB_POSIXCHECK gl_ASSERT_NO_GNULIB_TESTS gl_INIT -AC_FUNC_STRFTIME - # UNIX98 PTYs. AC_CHECK_FUNCS(grantpt) @@ -3062,15 +3064,7 @@ if test "x$GCC" = xyes \ AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.]) fi -#### Find out which version of Emacs this is. -[version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`] -if test x"${version}" = x; then - AC_MSG_ERROR([can't find current emacs version in `${srcdir}/src/emacs.c'.]) -fi -if test x"${version}" != x"$PACKAGE_VERSION"; then - AC_MSG_WARN([version mismatch between `${srcdir}/configure.in' and `${srcdir}/src/emacs.c'.]) -fi +version=$PACKAGE_VERSION ### Specify what sort of things we'll be editing into Makefile and config.h. ### Use configuration here uncanonicalized to avoid exceeding size limits. @@ -3114,7 +3108,6 @@ fi S_FILE="\$(srcdir)/${opsysfile}" AC_SUBST(M_FILE) AC_SUBST(S_FILE) -AC_SUBST(GETLOADAVG_LIBS) AC_SUBST(ns_appdir) AC_SUBST(ns_appbindir) AC_SUBST(ns_appresdir) @@ -3434,8 +3427,9 @@ AC_SUBST(WINDOW_SUPPORT) AH_TOP([/* GNU Emacs site configuration template file. - Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2011 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3517,8 +3511,6 @@ AH_BOTTOM([ #endif #endif -#define my_strftime nstrftime /* for strftime.c */ - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */ @@ -3713,6 +3705,18 @@ fi test "${exec_prefix}" != NONE && exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`] +AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \ + doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ + doc/lispref/Makefile src/Makefile \ + lwlib/Makefile lisp/Makefile leim/Makefile test/automated/Makefile]) + +dnl Make the necessary directories, if they don't exist. +AC_CONFIG_COMMANDS([mkdirs], [ +for dir in etc lisp ; do + test -d ${dir} || mkdir ${dir} +done +]) + dnl You might wonder (I did) why epaths.h is generated by running make, 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); @@ -3721,22 +3725,18 @@ 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. -AC_OUTPUT(Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \ - doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ - doc/lispref/Makefile src/Makefile \ - lwlib/Makefile lisp/Makefile leim/Makefile test/automated/Makefile, [ - -### Make the necessary directories, if they don't exist. -for dir in etc lisp ; do - test -d ${dir} || mkdir ${dir} -done - +AC_CONFIG_COMMANDS([epaths], [ echo creating src/epaths.h ${MAKE-make} epaths-force +], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS"]) +AC_CONFIG_COMMANDS([gdbinit], [ if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then echo creating src/.gdbinit echo source $srcdir/src/.gdbinit > src/.gdbinit fi +]) -], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS"]) +AC_OUTPUT + +dnl configure.in ends here