Commit 8a2b8c4f authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents 10f72a37 7eca871a
2010-05-24 Romain Francoise <romain@orebokech.com>
* make-dist: Look for version in src/emacs.c.
Use lisp/subr.el rather than lisp/version.el for location check.
2010-05-21 Glenn Morris <rgm@gnu.org>
* configure.in (MKDEPDIR): Parallel build tweak.
* configure.in (ns_frag): New output file.
* configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.
(OLDXMENU_TARGET): Set to empty if USE_GTK.
* configure.in (cannot_dump): New output variable.
2010-05-20 enami tsugutomo <tsugutomo.enami@jp.sony.com>
* configure.in: On NetBSD, if terminfo is found, use it in
preference to termcap. (Bug#6190)
2010-05-20 Glenn Morris <rgm@gnu.org>
* make-dist (src): Include *.mk.
* config.bat: Concatenate deps.mk onto the end of src/Makefile.
* configure.in (DEPFLAGS, MKDEPDIR): New output variables.
(deps_frag): New output file.
(AUTO_DEPEND): Remove this definition.
* configure.in (--with-gtk, --with-gcc): Remove option stubs.
2010-05-19 Glenn Morris <rgm@gnu.org>
* configure.in (LINKER, YMF_PASS_LDFLAGS): New output variables.
(ORDINARY_LINK): New AC_DEFINE.
(LIB_GCC): No need to set if ORDINARY_LINK.
2010-05-18 Glenn Morris <rgm@gnu.org> 2010-05-18 Glenn Morris <rgm@gnu.org>
* configure.in (POST_ALLOC_OBJ) [cygwin]: Omit vm-limit.o. * configure.in (POST_ALLOC_OBJ) [cygwin]: Omit vm-limit.o.
......
...@@ -553,9 +553,13 @@ All discarded messages are stored in /var/lib/mailman/spam. ...@@ -553,9 +553,13 @@ All discarded messages are stored in /var/lib/mailman/spam.
If a non-spam message accidentally gets discarded, just do: If a non-spam message accidentally gets discarded, just do:
cat /var/lib/mailman/spam/not-really-spam.msg | /usr/lib/debbugs/receive cat /var/lib/mailman/spam/not-really-spam.msg | /usr/lib/debbugs/receive
chown Debian-debbugs:Debian-debbugs /var/lib/debbugs/spool/incoming/*
... check it works ... ... check it works ...
mv /var/lib/mailman/spam/not-really-spam.msg /var/lib/mailman/not-spam/ mv /var/lib/mailman/spam/not-really-spam.msg /var/lib/mailman/not-spam/
Also check that the sender was not added to the auto-discard/reject list
in the debbugs-submit Mailman interface.
** Administrivia ** Administrivia
The debbugs-submit list should have the administrivia option off, The debbugs-submit list should have the administrivia option off,
......
...@@ -190,10 +190,11 @@ rem On my system dir.h gets in the way. It's a VMS file so who cares. ...@@ -190,10 +190,11 @@ rem On my system dir.h gets in the way. It's a VMS file so who cares.
if exist dir.h ren dir.h vmsdir.h if exist dir.h ren dir.h vmsdir.h
rem Create "makefile" from "makefile.in". rem Create "makefile" from "makefile.in".
rm -f Makefile junk.c rm -f Makefile junk.c junk2.c
sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c
gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile copy junk.c + deps.mk junk2.c
rm -f junk.c gcc -E -traditional junk2.c | sed -f ../msdos/sed1v2.inp >Makefile
rm -f junk.c junk2.c
if "%X11%" == "" goto src5 if "%X11%" == "" goto src5
mv Makefile makefile.tmp mv Makefile makefile.tmp
......
...@@ -701,6 +701,7 @@ RANLIB ...@@ -701,6 +701,7 @@ RANLIB
INSTALL_INFO INSTALL_INFO
GZIP_PROG GZIP_PROG
MAKEINFO MAKEINFO
cannot_dump
LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM
C_SWITCH_MACHINE C_SWITCH_MACHINE
C_SWITCH_SYSTEM C_SWITCH_SYSTEM
...@@ -714,6 +715,8 @@ ALSA_CFLAGS ...@@ -714,6 +715,8 @@ ALSA_CFLAGS
ALSA_LIBS ALSA_LIBS
CFLAGS_SOUND CFLAGS_SOUND
SET_MAKE SET_MAKE
MKDEPDIR
DEPFLAGS
XMKMF XMKMF
LD_SWITCH_X_SITE_AUX LD_SWITCH_X_SITE_AUX
LD_SWITCH_X_SITE_AUX_RPATH LD_SWITCH_X_SITE_AUX_RPATH
...@@ -818,12 +821,15 @@ PRE_ALLOC_OBJ ...@@ -818,12 +821,15 @@ PRE_ALLOC_OBJ
POST_ALLOC_OBJ POST_ALLOC_OBJ
LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_SYSTEM_TEMACS
LD_SWITCH_SYSTEM_EXTRA LD_SWITCH_SYSTEM_EXTRA
YMF_PASS_LDFLAGS
LINKER
LIB_GCC LIB_GCC
MOUSE_SUPPORT MOUSE_SUPPORT
TOOLTIP_SUPPORT TOOLTIP_SUPPORT
WINDOW_SUPPORT WINDOW_SUPPORT
LTLIBOBJS' LTLIBOBJS'
ac_subst_files='' ac_subst_files='deps_frag
ns_frag'
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
with_pop with_pop
...@@ -854,8 +860,6 @@ with_dbus ...@@ -854,8 +860,6 @@ with_dbus
with_gconf with_gconf
with_selinux with_selinux
with_makeinfo with_makeinfo
with_gtk
with_gcc
with_pkg_config_prog with_pkg_config_prog
with_crt_dir with_crt_dir
with_gnustep_conf with_gnustep_conf
...@@ -1569,7 +1573,6 @@ Optional Packages: ...@@ -1569,7 +1573,6 @@ Optional Packages:
--without-gconf don't compile with GConf support --without-gconf don't compile with GConf support
--without-selinux don't compile with SELinux support --without-selinux don't compile with SELinux support
--without-makeinfo don't require makeinfo for building manuals --without-makeinfo don't require makeinfo for building manuals
--with-pkg-config-prog=PATH --with-pkg-config-prog=PATH
path to pkg-config for finding GTK and librsvg path to pkg-config for finding GTK and librsvg
--with-crt-dir=DIR directory containing crtn.o etc. The default is --with-crt-dir=DIR directory containing crtn.o etc. The default is
...@@ -2382,28 +2385,6 @@ fi ...@@ -2382,28 +2385,6 @@ fi
   
   
   
# Check whether --with-gtk was given.
if test "${with_gtk+set}" = set; then
withval=$with_gtk; { { $as_echo "$as_me:$LINENO: error: --with-gtk has been removed. Use --with-x-toolkit to
specify a toolkit." >&5
$as_echo "$as_me: error: --with-gtk has been removed. Use --with-x-toolkit to
specify a toolkit." >&2;}
{ (exit 1); exit 1; }; }
fi
# Check whether --with-gcc was given.
if test "${with_gcc+set}" = set; then
withval=$with_gcc; { { $as_echo "$as_me:$LINENO: error: --with-gcc has been removed. Set the \`CC' environment
variable to specify a compiler." >&5
$as_echo "$as_me: error: --with-gcc has been removed. Set the \`CC' environment
variable to specify a compiler." >&2;}
{ (exit 1); exit 1; }; }
fi
# Check whether --with-pkg-config-prog was given. # Check whether --with-pkg-config-prog was given.
if test "${with_pkg_config_prog+set}" = set; then if test "${with_pkg_config_prog+set}" = set; then
withval=$with_pkg_config_prog; withval=$with_pkg_config_prog;
...@@ -5851,6 +5832,12 @@ configure___ LIBX=-lX11 ...@@ -5851,6 +5832,12 @@ configure___ LIBX=-lX11
   
configure___ unexec=UNEXEC configure___ unexec=UNEXEC
   
#ifdef CANNOT_DUMP
configure___ cannot_dump=yes
#else
configure___ cannot_dump=no
#endif
#ifdef SYSTEM_MALLOC #ifdef SYSTEM_MALLOC
configure___ system_malloc=yes configure___ system_malloc=yes
#else #else
...@@ -5912,6 +5899,9 @@ fi ...@@ -5912,6 +5899,9 @@ fi
rm ${tempcname} rm ${tempcname}
   
   
LD_SWITCH_SYSTEM= LD_SWITCH_SYSTEM=
case "$opsys" in case "$opsys" in
freebsd) freebsd)
...@@ -9501,6 +9491,9 @@ $as_echo "no" >&6; } ...@@ -9501,6 +9491,9 @@ $as_echo "no" >&6; }
fi fi
   
   
DEPFLAGS=
MKDEPDIR=":"
deps_frag=deps.mk
if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
{ $as_echo "$as_me:$LINENO: checking whether we are using GNU Make" >&5 { $as_echo "$as_me:$LINENO: checking whether we are using GNU Make" >&5
$as_echo_n "checking whether we are using GNU Make... " >&6; } $as_echo_n "checking whether we are using GNU Make... " >&6; }
...@@ -9567,13 +9560,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ...@@ -9567,13 +9560,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$ac_enable_autodepend" >&6; } $as_echo "$ac_enable_autodepend" >&6; }
fi fi
if test $ac_enable_autodepend = yes; then if test $ac_enable_autodepend = yes; then
DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d'
cat >>confdefs.h <<\_ACEOF ## In parallel builds, another make might create depdir between
#define AUTO_DEPEND 1 ## the first test and mkdir, so stick another test on the end.
_ACEOF ## Or use mkinstalldirs? mkdir -p is not portable.
MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}'
deps_frag=autodeps.mk
fi fi
fi fi
deps_frag=$srcdir/src/$deps_frag
   
{ $as_echo "$as_me:$LINENO: checking for long file names" >&5 { $as_echo "$as_me:$LINENO: checking for long file names" >&5
$as_echo_n "checking for long file names... " >&6; } $as_echo_n "checking for long file names... " >&6; }
...@@ -9960,6 +9959,7 @@ if test "${with_ns}" != no; then ...@@ -9960,6 +9959,7 @@ if test "${with_ns}" != no; then
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
## Pull in stuff from GNUstep-make. ## Pull in stuff from GNUstep-make.
## FIXME? Cleaner to use AC_SUBST_FILE for this?
NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
GUI_LIB=gnu GUI_LIB=gnu
include $GNUSTEP_MAKEFILES/Additional/base.make include $GNUSTEP_MAKEFILES/Additional/base.make
...@@ -10164,6 +10164,7 @@ fi ...@@ -10164,6 +10164,7 @@ fi
   
   
   
ns_frag=/dev/null
NS_OBJ= NS_OBJ=
NS_SUPPORT= NS_SUPPORT=
if test "${HAVE_NS}" = yes; then if test "${HAVE_NS}" = yes; then
...@@ -10175,6 +10176,7 @@ if test "${HAVE_NS}" = yes; then ...@@ -10175,6 +10176,7 @@ if test "${HAVE_NS}" = yes; then
if test "${EN_NS_SELF_CONTAINED}" = yes; then if test "${EN_NS_SELF_CONTAINED}" = yes; then
prefix=${ns_appresdir} prefix=${ns_appresdir}
fi fi
ns_frag=$srcdir/src/ns.mk
NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o"
NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc" NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc"
fi fi
...@@ -10184,6 +10186,7 @@ CPPFLAGS="$tmp_CPPFLAGS" ...@@ -10184,6 +10186,7 @@ CPPFLAGS="$tmp_CPPFLAGS"
   
   
   
case "${window_system}" in case "${window_system}" in
x11 ) x11 )
HAVE_X_WINDOWS=yes HAVE_X_WINDOWS=yes
...@@ -21622,7 +21625,7 @@ HAVE_LIBNCURSES=yes ...@@ -21622,7 +21625,7 @@ HAVE_LIBNCURSES=yes
   
## Use terminfo instead of termcap? ## Use terminfo instead of termcap?
## Note only system files NOT using terminfo are: ## Note only system files NOT using terminfo are:
## freebsd < 40000, ms-w32, msdos, netbsd, and ## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
## darwin|gnu without ncurses. ## darwin|gnu without ncurses.
TERMINFO=no TERMINFO=no
LIBS_TERMCAP= LIBS_TERMCAP=
...@@ -21715,13 +21718,22 @@ $as_echo "$emacs_cv_freebsd_terminfo" >&6; } ...@@ -21715,13 +21718,22 @@ $as_echo "$emacs_cv_freebsd_terminfo" >&6; }
fi fi
;; ;;
   
netbsd)
if test $ac_cv_search_tputs = -lterminfo; then
TERMINFO=yes
LIBS_TERMCAP="-lterminfo"
else
LIBS_TERMCAP="-ltermcap"
fi
;;
esac esac
   
case "$opsys" in case "$opsys" in
## hpux: Make sure we get select from libc rather than from libcurses ## hpux: Make sure we get select from libc rather than from libcurses
## because libcurses on HPUX 10.10 has a broken version of select. ## because libcurses on HPUX 10.10 has a broken version of select.
## We used to use -lc -lcurses, but this may be cleaner. ## We used to use -lc -lcurses, but this may be cleaner.
hpux*|netbsd) LIBS_TERMCAP="-ltermcap" ;; hpux*) LIBS_TERMCAP="-ltermcap" ;;
   
openbsd) LIBS_TERMCAP="-lncurses" ;; openbsd) LIBS_TERMCAP="-lncurses" ;;
   
...@@ -26491,7 +26503,6 @@ else ...@@ -26491,7 +26503,6 @@ else
fi fi
   
   
## The X Menu stuff is present in the X10 distribution, but missing ## The X Menu stuff is present in the X10 distribution, but missing
## from X11. If we have X10, just use the installed library; ## from X11. If we have X10, just use the installed library;
## otherwise, use our own copy. ## otherwise, use our own copy.
...@@ -26511,7 +26522,9 @@ _ACEOF ...@@ -26511,7 +26522,9 @@ _ACEOF
LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}" OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}"
else else
OLDXMENU= ## For a syntactically valid Makefile; not actually used for anything.
## See comments in src/Makefile.in.
OLDXMENU=nothing
## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
if test "${HAVE_X_WINDOWS}" = "yes"; then if test "${HAVE_X_WINDOWS}" = "yes"; then
LIBXMENU="-lXMenu" LIBXMENU="-lXMenu"
...@@ -26523,7 +26536,8 @@ else ...@@ -26523,7 +26536,8 @@ else
fi fi
   
if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
OLDXMENU= OLDXMENU_TARGET=
OLDXMENU=nothing
LIBXMENU= LIBXMENU=
OLDXMENU_DEPS= OLDXMENU_DEPS=
fi fi
...@@ -26533,6 +26547,7 @@ fi ...@@ -26533,6 +26547,7 @@ fi
   
   
   
if test "${HAVE_MENUS}" = "yes" ; then if test "${HAVE_MENUS}" = "yes" ; then
   
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
...@@ -26616,8 +26631,79 @@ fi ...@@ -26616,8 +26631,79 @@ fi
   
   
   
LINKER=
ORDINARY_LINK=
case "$opsys" in
## gnu: GNU needs its own crt0.
aix4-2|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
cygwin) LINKER="\$(CC)" ;;
## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
## library search parth, i.e. it won't search /usr/lib for libc and
## friends. Using -nostartfiles instead avoids this problem, and
## will also work on earlier NetBSD releases.
netbsd|openbsd) LINKER="\$(CC) -nostartfiles" ;;
## macpcc: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says
## MkLinux/LinuxPPC needs this.
## ibms390x only supports opsys = gnu-linux so it can be added here.
gnu-*)
case "$machine" in
macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;;
esac
;;
esac
## A macro which other sections of Makefile can redefine to munge the
## flags before they are passed to LD. This is helpful if you have
## redefined LD to something odd, like "gcc".
## (The YMF prefix is a holdover from the old name "ymakefile".)
YMF_PASS_LDFLAGS=flags
if test "x$ORDINARY_LINK" = "xyes"; then
LINKER="\$(CC)"
cat >>confdefs.h <<\_ACEOF
#define ORDINARY_LINK 1
_ACEOF
## The system files defining neither ORDINARY_LINK nor LINKER are:
## (bsd-common), freebsd, gnu-* not on macppc|ibms390x, hpux*.
elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then
## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
## places that are difficult to figure out at make time. Fortunately,
## these same versions allow you to pass arbitrary flags on to the
## linker, so there is no reason not to use it as a linker.
##
## Well, it is not quite perfect. The "-nostdlib" keeps GCC from
## searching for libraries in its internal directories, so we have to
## ask GCC explicitly where to find libgcc.a (LIB_GCC below).
LINKER="\$(CC) -nostdlib"
## GCC passes any argument prefixed with -Xlinker directly to the linker.
## See prefix-args.c for an explanation of why we do not do this with the
## shell''s ``for'' construct. Note that sane people do not have '.' in
## their paths, so we must use ./prefix-args.
## TODO either make prefix-args check ORDINARY_LINK internally,
## or remove it altogether (bug#6184), removing the need for this macro.
YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`'
fi
test "x$LINKER" = "x" && LINKER=ld
## FIXME? What setting of YMF_PASS_LDFLAGS should this have?
test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"
## FIXME? The logic here is not precisely the same as that above
## setting YMF_PASS_LDFLAGS. There is no check here for a pre-defined
## LINKER. Should we only be setting LIB_GCC if LD ~ -nostdlib?
LIB_GCC= LIB_GCC=
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
   
case "$opsys" in case "$opsys" in
## cygwin: don't link against static libgcc. ## cygwin: don't link against static libgcc.
...@@ -27458,7 +27544,24 @@ $debug || ...@@ -27458,7 +27544,24 @@ $debug ||
# This happens for instance with `./config.status config.h'. # This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then if test -n "$CONFIG_FILES"; then
   
if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
ac_cs_awk_getline=:
ac_cs_awk_pipe_init=
ac_cs_awk_read_file='
while ((getline aline < (F[key])) > 0)
print(aline)
close(F[key])'
ac_cs_awk_pipe_fini=
else
ac_cs_awk_getline=false
ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
ac_cs_awk_read_file='
print "|#_!!_#|"
print "cat " F[key] " &&"
'$ac_cs_awk_pipe_init
# The final `:' finishes the AND list.
ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
fi
ac_cr=' ' ac_cr=' '
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
...@@ -27470,6 +27573,19 @@ fi ...@@ -27470,6 +27573,19 @@ fi
echo 'BEGIN {' >"$tmp/subs1.awk" && echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF _ACEOF
   
# Create commands to substitute file output variables.
{
echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
echo "_ACAWK" &&
echo "_ACEOF"
} >conf$$files.sh &&
. ./conf$$files.sh ||
{ { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
rm -f conf$$files.sh
   
{ {
echo "cat >conf$$subs.awk <<_ACEOF" && echo "cat >conf$$subs.awk <<_ACEOF" &&
...@@ -27551,7 +27667,7 @@ _ACAWK ...@@ -27551,7 +27667,7 @@ _ACAWK
cat >>"\$tmp/subs1.awk" <<_ACAWK && cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1 for (key in S) S_is_set[key] = 1
FS = "" FS = ""
\$ac_cs_awk_pipe_init
} }
{ {
line = $ 0 line = $ 0
...@@ -27569,10 +27685,16 @@ cat >>"\$tmp/subs1.awk" <<_ACAWK && ...@@ -27569,10 +27685,16 @@ cat >>"\$tmp/subs1.awk" <<_ACAWK &&
} else } else
len += 1 + keylen len += 1 + keylen
} }
if (nfields == 3 && !substed) {
key = field[2]
if (F[key] != "" && line ~ /^[ ]*@.*@[ ]*$/) {
\$ac_cs_awk_read_file
next
}
}
print line print line
} }
\$ac_cs_awk_pipe_fini
_ACAWK _ACAWK
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
...@@ -27959,7 +28081,12 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ...@@ -27959,7 +28081,12 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack $ac_datarootdir_hack
" "
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
if $ac_cs_awk_getline; then
$AWK -f "$tmp/subs.awk"
else
$AWK -f "$tmp/subs.awk" | $SHELL
fi >$tmp/out \
|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
$as_echo "$as_me: error: could not create $ac_file" >&2;} $as_echo "$as_me: error: could not create $ac_file" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
......
...@@ -2,9 +2,11 @@ dnl Autoconf script for GNU Emacs ...@@ -2,9 +2,11 @@ dnl Autoconf script for GNU Emacs
dnl To rebuild the `configure' script from this, execute the command dnl To rebuild the `configure' script from this, execute the command
dnl autoconf dnl autoconf
dnl in the directory containing this script. dnl in the directory containing this script.
dnl If you changed any AC_DEFINES, also run autoheader.
dnl dnl
dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. dnl 2005, 2006, 2007, 2008, 2009, 2010
dnl Free Software Foundation, Inc.
dnl dnl
dnl This file is part of GNU Emacs. dnl This file is part of GNU Emacs.
dnl dnl
...@@ -168,15 +170,6 @@ OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support]) ...@@ -168,15 +170,6 @@ OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals]) OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
dnl Can remove these in Emacs 24.
AC_ARG_WITH([gtk],,
[AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to
specify a toolkit.])],,)
AC_ARG_WITH([gcc],,
[AC_MSG_ERROR([--with-gcc has been removed. Set the `CC' environment
variable to specify a compiler.])],,)
AC_ARG_WITH([pkg-config-prog],dnl AC_ARG_WITH([pkg-config-prog],dnl
[AS_HELP_STRING([--with-pkg-config-prog=PATH], [AS_HELP_STRING([--with-pkg-config-prog=PATH],
[path to pkg-config for finding GTK and librsvg])]) [path to pkg-config for finding GTK and librsvg])])
...@@ -864,6 +857,12 @@ configure___ LIBX=-lX11 ...@@ -864,6 +857,12 @@ configure___ LIBX=-lX11
configure___ unexec=UNEXEC configure___ unexec=UNEXEC
#ifdef CANNOT_DUMP
configure___ cannot_dump=yes
#else
configure___ cannot_dump=no
#endif
#ifdef SYSTEM_MALLOC #ifdef SYSTEM_MALLOC
configure___ system_malloc=yes