2013-01-14 15:34:56 +00:00
|
|
|
--- configure
|
|
|
|
|
+++ configure
|
|
|
|
|
@@ -10020,6 +10020,7 @@ system_malloc=no
|
|
|
|
|
case "$opsys" in
|
|
|
|
|
## darwin ld insists on the use of malloc routines in the System framework.
|
|
|
|
|
darwin|sol2-10) system_malloc=yes ;;
|
|
|
|
|
+ gnu-linux) system_malloc=yes ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
if test "${system_malloc}" = "yes"; then
|
|
|
|
|
@@ -10063,6 +10064,7 @@ fi
|
|
|
|
|
use_mmap_for_buffers=no
|
|
|
|
|
case "$opsys" in
|
|
|
|
|
cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
|
|
|
|
|
+ gnu-linux) use_mmap_for_buffers=yes ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
--- configure.in
|
|
|
|
|
+++ configure.in
|
|
|
|
|
@@ -1661,6 +1661,7 @@ system_malloc=no
|
|
|
|
|
case "$opsys" in
|
|
|
|
|
## darwin ld insists on the use of malloc routines in the System framework.
|
|
|
|
|
darwin|sol2-10) system_malloc=yes ;;
|
|
|
|
|
+ gnu-linux) system_malloc=yes ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
if test "${system_malloc}" = "yes"; then
|
|
|
|
|
@@ -1701,6 +1702,7 @@ fi
|
|
|
|
|
use_mmap_for_buffers=no
|
|
|
|
|
case "$opsys" in
|
|
|
|
|
cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
|
|
|
|
|
+ gnu-linux) use_mmap_for_buffers=yes ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
AC_FUNC_MMAP
|
2012-06-28 09:17:09 +00:00
|
|
|
--- lib-src/Makefile.in
|
|
|
|
|
+++ lib-src/Makefile.in 2012-06-14 11:41:22.208010103 +0000
|
|
|
|
|
@@ -307,14 +307,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
|
|
|
|
|
../lib/libgnu.a: ../src/config.h
|
|
|
|
|
cd ../lib && $(MAKE) libgnu.a
|
|
|
|
|
|
|
|
|
|
+REGEXPOBJ =
|
|
|
|
|
+#REGEXPOBJ = regex.o
|
|
|
|
|
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
|
|
|
|
|
${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
|
|
|
|
|
${srcdir}/../src/regex.c
|
|
|
|
|
|
|
|
|
|
-etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h
|
|
|
|
|
+etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) ../src/config.h
|
|
|
|
|
$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
|
|
|
|
|
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
|
|
|
|
|
- regex.o $(LOADLIBES) -o etags
|
|
|
|
|
+ $(REGEXPOBJ) $(LOADLIBES) -o etags
|
|
|
|
|
|
|
|
|
|
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h
|
|
|
|
|
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
|
|
|
|
|
@@ -325,7 +330,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
|
|
|
|
|
ctags${EXEEXT}: etags${EXEEXT}
|
|
|
|
|
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
|
|
|
|
|
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
|
|
|
|
|
- regex.o $(LOADLIBES) -o ctags
|
|
|
|
|
+ $(REGEXPOBJ) $(LOADLIBES) -o ctags
|
|
|
|
|
|
|
|
|
|
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
|
|
|
|
|
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
|
|
|
|
|
--- lib-src/etags.c
|
|
|
|
|
+++ lib-src/etags.c 2012-06-26 16:03:43.356510061 +0000
|
|
|
|
|
@@ -92,7 +92,7 @@ char pot_etags_version[] = "@(#) pot rev
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
-# include <config.h>
|
|
|
|
|
+# include <../src/config.h>
|
|
|
|
|
/* This is probably not necessary any more. On some systems, config.h
|
|
|
|
|
used to define static as nothing for the sake of unexec. We don't
|
|
|
|
|
want that here since we don't use unexec. None of these systems
|
|
|
|
|
--- src/s/gnu-linux.h
|
|
|
|
|
+++ src/s/gnu-linux.h 2012-06-26 16:05:56.116010465 +0000
|
2013-01-14 15:34:56 +00:00
|
|
|
@@ -159,3 +159,6 @@ along with GNU Emacs. If not, see <http
|
2012-06-28 09:17:09 +00:00
|
|
|
} while (0)
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
+
|
|
|
|
|
+/* we have regex in the GNU C-library. */
|
|
|
|
|
+#define REGEXP_IN_LIBC
|
