forked from pool/emacs
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
--- configure.ac
|
|
+++ configure.ac 2013-05-21 14:16:11.589439382 +0000
|
|
@@ -1692,6 +1692,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
|
|
@@ -1732,6 +1733,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
|
|
--- configure
|
|
+++ configure 2013-05-21 13:59:14.357439665 +0000
|
|
@@ -9828,6 +9828,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
|
|
@@ -9871,6 +9872,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
|
|
|
|
|
|
--- lib-src/Makefile.in
|
|
+++ lib-src/Makefile.in 2013-05-21 14:51:33.357939393 +0000
|
|
@@ -296,14 +296,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
|
|
../lib/libgnu.a: $(config_h)
|
|
cd ../lib && $(MAKE) libgnu.a
|
|
|
|
+REGEXPOBJ =
|
|
+#REGEXPOBJ = regex.o
|
|
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
|
|
${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
|
|
${srcdir}/../src/regex.c
|
|
|
|
-etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
|
|
+etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) $(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 $(config_h)
|
|
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
|
|
@@ -314,7 +316,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 $(config_h)
|
|
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
|
|
--- lib-src/etags.c
|
|
+++ lib-src/etags.c 2013-05-21 14:52:23.881939078 +0000
|
|
@@ -91,7 +91,7 @@ char pot_etags_version[] = "@(#) pot rev
|
|
# define NDEBUG /* disable assert */
|
|
#endif
|
|
|
|
-#include <config.h>
|
|
+#include <../src/config.h>
|
|
|
|
#ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1 /* enables some compiler checks on GNU */
|