184 lines
6.5 KiB
Plaintext
184 lines
6.5 KiB
Plaintext
|
--- configure.in
|
|||
|
|
+++ configure.in Wed Jul 23 17:50:25 2003
|
|||
|
|
@@ -1127,8 +1127,8 @@
|
|||
|
|
case ${with_gcc} in
|
|||
|
|
"yes" ) CC="gcc" GCC=yes ;;
|
|||
|
|
"no" ) : ${CC=cc} ;;
|
|||
|
|
- * ) AC_PROG_CC
|
|||
|
|
esac
|
|||
|
|
+AC_PROG_CC
|
|||
|
|
|
|||
|
|
# On Suns, sometimes $CPP names a directory.
|
|||
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|||
|
|
@@ -1332,6 +1332,9 @@
|
|||
|
|
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
|
|||
|
|
|
|||
|
|
@@ -1549,9 +1552,9 @@
|
|||
|
|
AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
|
|||
|
|
AC_CACHE_CHECK(whether __after_morecore_hook exists,
|
|||
|
|
emacs_cv_var___after_morecore_hook,
|
|||
|
|
-AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
|
|||
|
|
+[AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
|
|||
|
|
emacs_cv_var___after_morecore_hook=yes,
|
|||
|
|
- emacs_cv_var___after_morecore_hook=no))
|
|||
|
|
+ emacs_cv_var___after_morecore_hook=no)])
|
|||
|
|
if test $emacs_cv_var___after_morecore_hook = no; then
|
|||
|
|
doug_lea_malloc=no
|
|||
|
|
fi
|
|||
|
|
@@ -1695,11 +1698,11 @@
|
|||
|
|
if test "${window_system}" = "x11"; then
|
|||
|
|
AC_MSG_CHECKING(X11 version 6)
|
|||
|
|
AC_CACHE_VAL(emacs_cv_x11_version_6,
|
|||
|
|
- AC_TRY_LINK([#include <X11/Xlib.h>],
|
|||
|
|
+ [AC_TRY_LINK([#include <X11/Xlib.h>],
|
|||
|
|
[#if XlibSpecificationRelease < 6
|
|||
|
|
fail;
|
|||
|
|
#endif
|
|||
|
|
-], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no))
|
|||
|
|
+], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)])
|
|||
|
|
if test $emacs_cv_x11_version_6 = yes; then
|
|||
|
|
AC_MSG_RESULT(6 or newer)
|
|||
|
|
AC_DEFINE(HAVE_X11R6)
|
|||
|
|
@@ -1711,11 +1714,11 @@
|
|||
|
|
if test "${window_system}" = "x11"; then
|
|||
|
|
AC_MSG_CHECKING(X11 version 5)
|
|||
|
|
AC_CACHE_VAL(emacs_cv_x11_version_5,
|
|||
|
|
- AC_TRY_LINK([#include <X11/Xlib.h>],
|
|||
|
|
+ [AC_TRY_LINK([#include <X11/Xlib.h>],
|
|||
|
|
[#if XlibSpecificationRelease < 5
|
|||
|
|
fail;
|
|||
|
|
#endif
|
|||
|
|
-], emacs_cv_x11_version_5=yes, emacs_cv_x11_version_5=no))
|
|||
|
|
+], emacs_cv_x11_version_5=yes, emacs_cv_x11_version_5=no)])
|
|||
|
|
if test $emacs_cv_x11_version_5 = yes; then
|
|||
|
|
AC_MSG_RESULT(5 or newer)
|
|||
|
|
HAVE_X11R5=yes
|
|||
|
|
@@ -1732,12 +1735,12 @@
|
|||
|
|
if test x"${HAVE_X11R5}" = xyes; then
|
|||
|
|
AC_MSG_CHECKING(X11 version 5 with Xaw)
|
|||
|
|
AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
|
|||
|
|
- AC_TRY_LINK([
|
|||
|
|
+ [AC_TRY_LINK([
|
|||
|
|
#include <X11/Intrinsic.h>
|
|||
|
|
#include <X11/Xaw/Simple.h>],
|
|||
|
|
[],
|
|||
|
|
emacs_cv_x11_version_5_with_xaw=yes,
|
|||
|
|
- emacs_cv_x11_version_5_with_xaw=no))
|
|||
|
|
+ emacs_cv_x11_version_5_with_xaw=no)])
|
|||
|
|
if test $emacs_cv_x11_version_5_with_xaw = yes; then
|
|||
|
|
AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
|
|||
|
|
USE_X_TOOLKIT=LUCID
|
|||
|
|
@@ -1755,11 +1758,11 @@
|
|||
|
|
if test "${USE_X_TOOLKIT}" != "none"; then
|
|||
|
|
AC_MSG_CHECKING(X11 toolkit version)
|
|||
|
|
AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6,
|
|||
|
|
- AC_TRY_LINK([#include <X11/Intrinsic.h>],
|
|||
|
|
+ [AC_TRY_LINK([#include <X11/Intrinsic.h>],
|
|||
|
|
[#if XtSpecificationRelease < 6
|
|||
|
|
fail;
|
|||
|
|
#endif
|
|||
|
|
-], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no))
|
|||
|
|
+], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no)])
|
|||
|
|
HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
|
|||
|
|
if test $emacs_cv_x11_toolkit_version_6 = yes; then
|
|||
|
|
AC_MSG_RESULT(6 or newer)
|
|||
|
|
@@ -1789,13 +1792,13 @@
|
|||
|
|
|
|||
|
|
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
|
|||
|
|
AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
|
|||
|
|
- AC_TRY_COMPILE([#include <Xm/Xm.h>],
|
|||
|
|
+ [AC_TRY_COMPILE([#include <Xm/Xm.h>],
|
|||
|
|
[#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
|
|||
|
|
int x = 5;
|
|||
|
|
#else
|
|||
|
|
Motif version prior to 2.1.
|
|||
|
|
#endif],
|
|||
|
|
- emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no))
|
|||
|
|
+ emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)])
|
|||
|
|
HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
|
|||
|
|
if test $emacs_cv_motif_version_2_1 = yes; then
|
|||
|
|
HAVE_LIBXP=no
|
|||
|
|
@@ -1944,9 +1947,9 @@
|
|||
|
|
# If netdb.h doesn't declare h_errno, we must declare it by hand.
|
|||
|
|
AC_CACHE_CHECK(whether netdb declares h_errno,
|
|||
|
|
emacs_cv_netdb_declares_h_errno,
|
|||
|
|
-AC_TRY_LINK([#include <netdb.h>],
|
|||
|
|
+[AC_TRY_LINK([#include <netdb.h>],
|
|||
|
|
[return h_errno;],
|
|||
|
|
- emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no))
|
|||
|
|
+ emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no)])
|
|||
|
|
if test $emacs_cv_netdb_declares_h_errno = yes; then
|
|||
|
|
AC_DEFINE(HAVE_H_ERRNO)
|
|||
|
|
fi
|
|||
|
|
@@ -2044,11 +2047,11 @@
|
|||
|
|
AC_CHECK_HEADERS(krb5.h)
|
|||
|
|
else
|
|||
|
|
AC_CHECK_HEADERS(des.h,,
|
|||
|
|
- AC_CHECK_HEADERS(kerberosIV/des.h,,
|
|||
|
|
- AC_CHECK_HEADERS(kerberos/des.h)))
|
|||
|
|
+ [AC_CHECK_HEADERS(kerberosIV/des.h,,
|
|||
|
|
+ [AC_CHECK_HEADERS(kerberos/des.h)])])
|
|||
|
|
AC_CHECK_HEADERS(krb.h,,
|
|||
|
|
- AC_CHECK_HEADERS(kerberosIV/krb.h,,
|
|||
|
|
- AC_CHECK_HEADERS(kerberos/krb.h)))
|
|||
|
|
+ [AC_CHECK_HEADERS(kerberosIV/krb.h,,
|
|||
|
|
+ [AC_CHECK_HEADERS(kerberos/krb.h)])])
|
|||
|
|
fi
|
|||
|
|
AC_CHECK_HEADERS(com_err.h)
|
|||
|
|
fi
|
|||
|
|
@@ -2105,7 +2108,7 @@
|
|||
|
|
AC_CHECK_FUNCS(gettimeofday)
|
|||
|
|
AC_CACHE_CHECK(whether gettimeofday can accept two arguments,
|
|||
|
|
emacs_cv_gettimeofday_two_arguments,
|
|||
|
|
- AC_TRY_COMPILE([
|
|||
|
|
+ [AC_TRY_COMPILE([
|
|||
|
|
#ifdef TIME_WITH_SYS_TIME
|
|||
|
|
#include <sys/time.h>
|
|||
|
|
#include <time.h>
|
|||
|
|
@@ -2119,7 +2122,7 @@
|
|||
|
|
[struct timeval time;
|
|||
|
|
gettimeofday (&time, 0);],
|
|||
|
|
emacs_cv_gettimeofday_two_arguments=yes,
|
|||
|
|
- emacs_cv_gettimeofday_two_arguments=no))
|
|||
|
|
+ emacs_cv_gettimeofday_two_arguments=no)])
|
|||
|
|
if test $emacs_cv_gettimeofday_two_arguments = no; then
|
|||
|
|
AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)
|
|||
|
|
fi
|
|||
|
|
@@ -2356,7 +2359,7 @@
|
|||
|
|
sed -e '1,/start of cpp stuff/d'\
|
|||
|
|
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
|
|||
|
|
< Makefile.c > junk.c
|
|||
|
|
- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
|
|||
|
|
+ $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
|
|||
|
|
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
|
|||
|
|
cat junk1.c junk2.c > Makefile.new
|
|||
|
|
rm -f junk.c junk1.c junk2.c
|
|||
|
|
@@ -2372,7 +2375,7 @@
|
|||
|
|
sed -e '1,/start of cpp stuff/d'\
|
|||
|
|
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
|
|||
|
|
< Makefile.c > junk.c
|
|||
|
|
- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
|
|||
|
|
+ $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
|
|||
|
|
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
|
|||
|
|
cat junk1.c junk2.c > Makefile.new
|
|||
|
|
rm -f junk.c junk1.c junk2.c
|
|||
|
|
@@ -2380,9 +2383,9 @@
|
|||
|
|
mv -f Makefile.new Makefile
|
|||
|
|
)
|
|||
|
|
|
|||
|
|
-if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then
|
|||
|
|
+if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
|
|||
|
|
echo creating src/.gdbinit
|
|||
|
|
- echo source $top_srcdir/src/.gdbinit > src/.gdbinit
|
|||
|
|
+ echo source $srcdir/src/.gdbinit > src/.gdbinit
|
|||
|
|
fi
|
|||
|
|
|
|||
|
|
# This is how we know whether to re-run configure in certain cases.
|