Merge from emacs--rel--22

[bpt/emacs.git] / src / config.in

diff --git a/src/config.in b/src/config.in
index c86215d..70a5b7b 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -1,13 +1,14 @@
 /* src/config.in.  Generated from configure.in by autoheader.  */
 
 /* GNU Emacs site configuration template file.
 /* src/config.in.  Generated from configure.in by autoheader.  */
 
 /* GNU Emacs site configuration template file.

-   Copyright (C) 1988, 93, 94, 99, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
+             Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -17,8 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the

-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 /* No code in Emacs #includes config.h twice, but some bits of code
 
 
 /* No code in Emacs #includes config.h twice, but some bits of code


@@ -86,6 +87,9 @@ Boston, MA 02111-1307, USA.  */
    */
 #undef HAVE_ALLOCA_H
 
    */
 #undef HAVE_ALLOCA_H
 

+/* Define to 1 if ALSA is available. */
+#undef HAVE_ALSA
+

 /* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 
 /* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 


@@ -110,10 +114,17 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <com_err.h> header file. */
 #undef HAVE_COM_ERR_H
 
 /* Define to 1 if you have the <com_err.h> header file. */
 #undef HAVE_COM_ERR_H
 

+/* Define to 1 if you have /usr/lib/crti.o. */
+#undef HAVE_CRTIN
+

 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 
 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 

+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#undef HAVE_DECL_TZNAME
+

 /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL___SYS_SIGLIST
 /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL___SYS_SIGLIST


@@ -124,6 +135,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if dynamic ptys are supported. */
 #undef HAVE_DEV_PTMX
 
 /* Define to 1 if dynamic ptys are supported. */
 #undef HAVE_DEV_PTMX
 

+/* Define to 1 if you have the `difftime' function. */
+#undef HAVE_DIFFTIME
+

 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 


@@ -157,6 +171,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 
 /* Define to 1 if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 

+/* Define to 1 if you have the `gdk_display_open' function. */
+#undef HAVE_GDK_DISPLAY_OPEN
+

 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 


@@ -178,6 +195,12 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `getloadavg' function. */
 #undef HAVE_GETLOADAVG
 
 /* Define to 1 if you have the `getloadavg' function. */
 #undef HAVE_GETLOADAVG
 

+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define to 1 if you have the `getopt_long_only' function. */
+#undef HAVE_GETOPT_LONG_ONLY
+

 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 


@@ -187,6 +210,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `getpt' function. */
 #undef HAVE_GETPT
 
 /* Define to 1 if you have the `getpt' function. */
 #undef HAVE_GETPT
 

+/* Define to 1 if you have the `getrusage' function. */
+#undef HAVE_GETRUSAGE
+

 /* Define to 1 if you have the `getsockname' function. */
 #undef HAVE_GETSOCKNAME
 
 /* Define to 1 if you have the `getsockname' function. */
 #undef HAVE_GETSOCKNAME
 


@@ -199,15 +225,40 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
 /* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 

-/* Define to 1 if you have the ungif library (-lungif). */
+/* Define to 1 if you have the `get_current_dir_name' function. */
+#undef HAVE_GET_CURRENT_DIR_NAME
+
+/* Define to 1 if you have a gif library (default -lgif; otherwise specify
+   with LIBGIF). */

 #undef HAVE_GIF
 
 #undef HAVE_GIF
 

+/* Define to 1 if you have the gpm library (-lgpm). */
+#undef HAVE_GPM
+

 /* Define to 1 if you have the `grantpt' function. */
 #undef HAVE_GRANTPT
 
 /* Define to 1 if using GTK. */
 #undef HAVE_GTK
 
 /* Define to 1 if you have the `grantpt' function. */
 #undef HAVE_GRANTPT
 
 /* Define to 1 if using GTK. */
 #undef HAVE_GTK
 

+/* Define to 1 if you have GTK and pthread (-lpthread). */
+#undef HAVE_GTK_AND_PTHREAD
+
+/* Define to 1 if GTK has both file selection and chooser dialog. */
+#undef HAVE_GTK_FILE_BOTH
+
+/* Define to 1 if you have the `gtk_file_chooser_dialog_new' function. */
+#undef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW
+
+/* Define to 1 if you have the `gtk_file_selection_new' function. */
+#undef HAVE_GTK_FILE_SELECTION_NEW
+
+/* Define to 1 if you have the `gtk_main' function. */
+#undef HAVE_GTK_MAIN
+
+/* Define to 1 if GTK can handle more than one display. */
+#undef HAVE_GTK_MULTIDISPLAY
+

 /* Define to 1 if netdb.h declares h_errno. */
 #undef HAVE_H_ERRNO
 
 /* Define to 1 if netdb.h declares h_errno. */
 #undef HAVE_H_ERRNO
 


@@ -295,6 +346,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
 #undef HAVE_LIBNCURSES
 
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
 #undef HAVE_LIBNCURSES
 

+/* Define to 1 if you have the <libpng/png.h> header file. */
+#undef HAVE_LIBPNG_PNG_H
+

 /* Define to 1 if you have the `pthreads' library (-lpthreads). */
 #undef HAVE_LIBPTHREADS
 
 /* Define to 1 if you have the `pthreads' library (-lpthreads). */
 #undef HAVE_LIBPTHREADS
 


@@ -316,6 +370,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <linux/version.h> header file. */
 #undef HAVE_LINUX_VERSION_H
 
 /* Define to 1 if you have the <linux/version.h> header file. */
 #undef HAVE_LINUX_VERSION_H
 

+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+

 /* Define to 1 if you have the `logb' function. */
 #undef HAVE_LOGB
 
 /* Define to 1 if you have the `logb' function. */
 #undef HAVE_LOGB
 


@@ -334,6 +391,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <maillock.h> header file. */
 #undef HAVE_MAILLOCK_H
 
 /* Define to 1 if you have the <maillock.h> header file. */
 #undef HAVE_MAILLOCK_H
 

+/* Define to 1 if you have the <malloc/malloc.h> header file. */
+#undef HAVE_MALLOC_MALLOC_H
+

 /* Define to 1 if you have the `mblen' function. */
 #undef HAVE_MBLEN
 
 /* Define to 1 if you have the `mblen' function. */
 #undef HAVE_MBLEN
 


@@ -343,12 +403,24 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `mbsinit' function. */
 #undef HAVE_MBSINIT
 
 /* Define to 1 if you have the `mbsinit' function. */
 #undef HAVE_MBSINIT
 

+/* Define to 1 if <wchar.h> declares mbstate_t. */
+#undef HAVE_MBSTATE_T
+
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+

 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

+/* Define to 1 if you have the `mempcpy' function. */
+#undef HAVE_MEMPCPY
+

 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 


@@ -375,18 +447,36 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 
 /* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 

+/* Define to 1 if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+

 /* Define to 1 if you have the <nlist.h> header file. */
 #undef HAVE_NLIST_H
 
 /* Define to 1 if you have the <nlist.h> header file. */
 #undef HAVE_NLIST_H
 

+/* Define to 1 if personality LINUX32 can be set. */
+#undef HAVE_PERSONALITY_LINUX32
+

 /* Define to 1 if you have the png library (-lpng). */
 #undef HAVE_PNG
 
 /* Define to 1 if you have the png library (-lpng). */
 #undef HAVE_PNG
 

+/* Define to 1 if you have the <png.h> header file. */
+#undef HAVE_PNG_H
+
+/* Define to 1 if you have the `posix_memalign' function. */
+#undef HAVE_POSIX_MEMALIGN
+

 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
 
 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
 

+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+

 /* Define to 1 if you have the <pty.h> header file. */
 #undef HAVE_PTY_H
 
 /* Define to 1 if you have the <pty.h> header file. */
 #undef HAVE_PTY_H
 

+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+

 /* Define to 1 if you have the `random' function. */
 #undef HAVE_RANDOM
 
 /* Define to 1 if you have the `random' function. */
 #undef HAVE_RANDOM
 


@@ -468,6 +558,21 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 

+/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_ADDR
+
+/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
+
+/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_FLAGS
+
+/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_HWADDR
+
+/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_NETMASK
+

 /* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
 
 /* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
 


@@ -477,9 +582,15 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
 #undef HAVE_STRUCT_UTIMBUF
 
 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
 #undef HAVE_STRUCT_UTIMBUF
 

+/* Define to 1 if you have the `sync' function. */
+#undef HAVE_SYNC
+

 /* Define to 1 if you have the `sysinfo' function. */
 #undef HAVE_SYSINFO
 
 /* Define to 1 if you have the `sysinfo' function. */
 #undef HAVE_SYSINFO
 

+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+

 /* Define to 1 if you have the <sys/mman.h> header file. */
 #undef HAVE_SYS_MMAN_H
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #undef HAVE_SYS_MMAN_H
 


@@ -492,6 +603,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 

+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+

 /* Define to 1 if you have the <sys/soundcard.h> header file. */
 #undef HAVE_SYS_SOUNDCARD_H
 
 /* Define to 1 if you have the <sys/soundcard.h> header file. */
 #undef HAVE_SYS_SOUNDCARD_H
 


@@ -513,12 +627,18 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <sys/un.h> header file. */
 #undef HAVE_SYS_UN_H
 
 /* Define to 1 if you have the <sys/un.h> header file. */
 #undef HAVE_SYS_UN_H
 

+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#undef HAVE_SYS_UTSNAME_H
+

 /* Define to 1 if you have the <sys/vlimit.h> header file. */
 #undef HAVE_SYS_VLIMIT_H
 
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
 /* Define to 1 if you have the <sys/vlimit.h> header file. */
 #undef HAVE_SYS_VLIMIT_H
 
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 

+/* Define to 1 if you have the <sys/_mbstate_t.h> header file. */
+#undef HAVE_SYS__MBSTATE_T_H
+

 /* Define to 1 if you have the <termcap.h> header file. */
 #undef HAVE_TERMCAP_H
 
 /* Define to 1 if you have the <termcap.h> header file. */
 #undef HAVE_TERMCAP_H
 


@@ -588,12 +708,21 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the X11R6 or newer version of Xt. */
 #undef HAVE_X11XTR6
 
 /* Define to 1 if you have the X11R6 or newer version of Xt. */
 #undef HAVE_X11XTR6
 

+/* Define to 1 if the file /usr/lib64 exists. */
+#undef HAVE_X86_64_LIB64_DIR
+

 /* Define to 1 if you have the Xaw3d library (-lXaw3d). */
 #undef HAVE_XAW3D
 
 /* Define to 1 if you're using XFree386. */
 #undef HAVE_XFREE386
 
 /* Define to 1 if you have the Xaw3d library (-lXaw3d). */
 #undef HAVE_XAW3D
 
 /* Define to 1 if you're using XFree386. */
 #undef HAVE_XFREE386
 

+/* Define to 1 if you have the Xft library. */
+#undef HAVE_XFT
+
+/* Define to 1 if XIM is available */
+#undef HAVE_XIM
+

 /* Define to 1 if you have the XkbGetKeyboard function. */
 #undef HAVE_XKBGETKEYBOARD
 
 /* Define to 1 if you have the XkbGetKeyboard function. */
 #undef HAVE_XKBGETKEYBOARD
 


@@ -640,8 +769,8 @@ Boston, MA 02111-1307, USA.  */
    Solaris, for example). */
 #undef LD_SWITCH_X_SITE_AUX
 
    Solaris, for example). */
 #undef LD_SWITCH_X_SITE_AUX
 

-/* Define to -llockfile if it is usable. */
-#undef LIBMAIL
+/* Compiler option to link with the gif library (if not -lgif). */
+#undef LIBGIF

 
 /* Define to 1 if localtime caches TZ. */
 #undef LOCALTIME_CACHE
 
 /* Define to 1 if localtime caches TZ. */
 #undef LOCALTIME_CACHE


@@ -653,9 +782,6 @@ Boston, MA 02111-1307, USA.  */
    on `HAVE_STRUCT_NLIST_N_UN_N_NAME */
 #undef NLIST_NAME_UNION
 
    on `HAVE_STRUCT_NLIST_N_UN_N_NAME */
 #undef NLIST_NAME_UNION
 

-/* Define to 1 if you have <nlist.h>. */
-#undef NLIST_STRUCT
-

 /* Define to 1 if you don't have struct exception in math.h. */
 #undef NO_MATHERR
 
 /* Define to 1 if you don't have struct exception in math.h. */
 #undef NO_MATHERR
 


@@ -690,10 +816,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be

-   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+   automatically deduced at runtime.
+       STACK_DIRECTION > 0 => grows toward higher addresses
+       STACK_DIRECTION < 0 => grows toward lower addresses
+       STACK_DIRECTION = 0 => direction of growth unknown */

 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */


@@ -727,6 +853,10 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if using an X toolkit. */
 #undef USE_X_TOOLKIT
 
 /* Define to 1 if using an X toolkit. */
 #undef USE_X_TOOLKIT
 

+/* Define to the type of the 6th arg of XRegisterIMInstantiateCallback, either
+   XPointer or XPointer*. */
+#undef XRegisterIMInstantiateCallback_arg6
+

 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */


@@ -748,6 +878,10 @@ Boston, MA 02111-1307, USA.  */
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 

+/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+#undef __GETOPT_PREFIX
+

 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES
 
 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES
 


@@ -768,6 +902,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

+/* Define to a type if <wchar.h> does not define. */
+#undef mbstate_t
+

 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 


@@ -812,6 +949,9 @@ Boston, MA 02111-1307, USA.  */
 /* Turned on June 1996 supposing nobody will mind it.  */
 #define AMPERSAND_FULL_NAME
 
 /* Turned on June 1996 supposing nobody will mind it.  */
 #define AMPERSAND_FULL_NAME
 

+/* We have blockinput.h.  */
+#define DO_BLOCK_INPUT
+

 /* Define HAVE_SOUND if we have sound support.  We know it works
    and compiles only on the specified platforms.   For others,
    it probably doesn't make sense to try.  */
 /* Define HAVE_SOUND if we have sound support.  We know it works
    and compiles only on the specified platforms.   For others,
    it probably doesn't make sense to try.  */


@@ -826,13 +966,16 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_SOUNDCARD_H
 #define HAVE_SOUND 1
 #endif
 #ifdef HAVE_SOUNDCARD_H
 #define HAVE_SOUND 1
 #endif

+#ifdef HAVE_ALSA
+#define HAVE_SOUND 1
+#endif

 #endif /* __FreeBSD__ || __NetBSD__ || __linux__  */
 
 /* 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'.  */
 #endif /* __FreeBSD__ || __NetBSD__ || __linux__  */
 
 /* 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'.  */

-#ifdef __GNUC__
+#if defined (__GNUC__) && defined (OPTIMIZE)

 #define INLINE __inline__
 #else
 #define INLINE
 #define INLINE __inline__
 #else
 #define INLINE


@@ -880,7 +1023,13 @@ Boston, MA 02111-1307, USA.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
 #define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
 #define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)

-#define RE_TRANSLATE_P(TBL) (XFASTINT (TBL) != 0)
+#ifdef make_number
+/* If make_number is a macro, use it.  */
+#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
+#else
+/* If make_number is a function, avoid it.  */
+#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0))
+#endif

 #endif
 
 /* Avoid link-time collision with system mktime if we will use our own.  */
 #endif
 
 /* Avoid link-time collision with system mktime if we will use our own.  */


@@ -888,6 +1037,8 @@ Boston, MA 02111-1307, USA.  */
 #define mktime emacs_mktime
 #endif
 
 #define mktime emacs_mktime
 #endif
 

+#define my_strftime nstrftime  /* for strftime.c */
+

 /* The rest of the code currently tests the CPP symbol BSTRING.
    Override any claims made by the system-description files.
    Note that on some SCO version it is possible to have bcopy and not bcmp.  */
 /* The rest of the code currently tests the CPP symbol BSTRING.
    Override any claims made by the system-description files.
    Note that on some SCO version it is possible to have bcopy and not bcmp.  */