Commit 372b4090 authored by Glenn Morris's avatar Glenn Morris
Browse files

Regenerate configure, src/config.in.

parent f14d1dfd
......@@ -717,6 +717,7 @@ SET_MAKE
XMKMF
LD_SWITCH_X_SITE_AUX
LD_SWITCH_X_SITE_AUX_RPATH
NS_IMPL_GNUSTEP_INC
NS_OBJ
NS_SUPPORT
LIB_STANDARD
......@@ -751,7 +752,6 @@ LIBPNG
LIBTIFF
LIBGIF
LIBGPM
GPM_MOUSE_SUPPORT
LIBXSM
ALLOCA
liblockfile
......@@ -796,7 +796,6 @@ ns_appdir
ns_appbindir
ns_appresdir
ns_appsrc
GNUSTEP_MAKEFILES
GNUSTEP_SYSTEM_HEADERS
GNUSTEP_SYSTEM_LIBRARIES
GNU_OBJC_CFLAGS
......@@ -815,6 +814,9 @@ POST_ALLOC_OBJ
LD_SWITCH_SYSTEM_TEMACS
LD_SWITCH_SYSTEM_EXTRA
LIB_GCC
MOUSE_SUPPORT
TOOLTIP_SUPPORT
WINDOW_SUPPORT
LTLIBOBJS'
ac_subst_files=''
ac_user_opts='
......@@ -9929,6 +9931,7 @@ fi
HAVE_NS=no
NS_IMPL_COCOA=no
NS_IMPL_GNUSTEP=no
NS_IMPL_GNUSTEP_INC=
tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
......@@ -9949,6 +9952,13 @@ if test "${with_ns}" != no; then
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
## Pull in stuff from GNUstep-make.
NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
GUI_LIB=gnu
include $GNUSTEP_MAKEFILES/Additional/base.make
include $GNUSTEP_MAKEFILES/Additional/gui.make
shared=no
"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
......@@ -10141,6 +10151,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
 
NS_OBJ=
NS_SUPPORT=
if test "${HAVE_NS}" = yes; then
......@@ -15991,7 +16002,7 @@ fi
### Use -lgpm if available, unless `--with-gpm=no'.
HAVE_GPM=no
LIBGPM=
GPM_MOUSE_SUPPORT=
MOUSE_SUPPORT=
if test "${with_gpm}" != "no"; then
if test "${ac_cv_header_gpm_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for gpm.h" >&5
......@@ -16201,12 +16212,12 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
 
LIBGPM=-lgpm
GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc"
## May be reset below.
MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)"
fi
fi
 
 
if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
$as_echo_n "checking for malloc/malloc.h... " >&6; }
......@@ -26357,7 +26368,6 @@ fi
 
 
 
cat >>confdefs.h <<_ACEOF
#define EMACS_CONFIGURATION "${canonical}"
_ACEOF
......@@ -26589,6 +26599,33 @@ if test "x$GCC" = "xyes"; then
fi
 
 
TOOLTIP_SUPPORT=
WINDOW_SUPPORT=
## If we're using X11/GNUstep, define some consequences.
if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_WINDOW_SYSTEM 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_MOUSE 1
_ACEOF
MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)"
TOOLTIP_SUPPORT="\${lispsource}mouse.elc"
WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)"
test "$HAVE_X_WINDOWS" = "yes" && \
WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)"
fi
 
 
 
......
......@@ -482,6 +482,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define if you have mouse support. */
#undef HAVE_MOUSE
/* Define to 1 if you have the `mremap' function. */
#undef HAVE_MREMAP
......@@ -737,6 +740,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <vfork.h> header file. */
#undef HAVE_VFORK_H
/* Define if you have a window system. */
#undef HAVE_WINDOW_SYSTEM
/* Define to 1 if `fork' works. */
#undef HAVE_WORKING_FORK
......@@ -1004,12 +1010,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef volatile
/* If we're using X11/Carbon/GNUstep, define some consequences. */
#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
#define HAVE_WINDOW_SYSTEM
#define HAVE_MOUSE
#endif
/* Define AMPERSAND_FULL_NAME if you use the convention
that & in the full name stands for the login id. */
/* Turned on June 1996 supposing nobody will mind it. */
......@@ -1034,7 +1034,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif /* __FreeBSD__ || __NetBSD__ || __linux__ */
/* If using GNU, then support inline function declarations. */
/* If using GNU, then support inline function declarations. */
/* Don't try to switch on inline handling as detected by AC_C_INLINE
generally, because even if non-gcc compilers accept `inline', they
may reject `extern inline'. */
......@@ -1059,7 +1059,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep.
(There is probably a better place to do this, but right now the Cocoa
side does this in s/darwin.h and we cannot
parallel this exactly since GNUstep is multi-OS. */
parallel this exactly since GNUstep is multi-OS. */
#ifdef HAVE_NS
# ifdef NS_IMPL_GNUSTEP
/* GNUstep needs a bit more pure memory. Of the existing knobs,
......@@ -1156,7 +1156,7 @@ extern char *getenv ();
#include "string.h"
#endif
#ifdef HAVE_STRINGS_H
#include "strings.h" /* May be needed for bcopy & al. */
#include "strings.h" /* May be needed for bcopy & al. */
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment