[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114177: Auto-commit of generated files.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114177: Auto-commit of generated files. |
Date: |
Mon, 09 Sep 2013 10:17:48 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114177
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-09 06:17:42 -0400
message:
Auto-commit of generated files.
modified:
autogen/Makefile.in makefile.in-20110108211121-3ig4un4ogtyyca3s-5
autogen/configure configure-20091113204419-o5vbwnq5f7feedwu-1624
=== modified file 'autogen/Makefile.in'
--- a/autogen/Makefile.in 2013-09-02 10:17:37 +0000
+++ b/autogen/Makefile.in 2013-09-09 10:17:42 +0000
@@ -677,7 +677,6 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTK_OBJ = @GTK_OBJ@
-GZIP_INFO = @GZIP_INFO@
GZIP_PROG = @GZIP_PROG@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
HAVE_ATOLL = @HAVE_ATOLL@
=== modified file 'autogen/configure'
--- a/autogen/configure 2013-09-07 10:17:39 +0000
+++ b/autogen/configure 2013-09-09 10:17:42 +0000
@@ -1442,7 +1442,6 @@
build_cpu
build
PROFILING_CFLAGS
-GZIP_INFO
cache_file
am__untar
am__tar
@@ -1545,7 +1544,7 @@
with_zlib
with_file_notification
with_makeinfo
-with_compress_info
+with_compress_install
with_pkg_config_prog
with_gameuser
with_gnustep_conf
@@ -2278,7 +2277,9 @@
use a file notification library (LIB one of: yes,
gfile, inotify, w32, no)
--without-makeinfo don't require makeinfo for building manuals
- --without-compress-info don't compress the installed Info pages
+ --without-compress-install
+ don't compress some files (.el, .info, etc.) when
+ installing. Equivalent to: make GZIP_PROG= install
--with-pkg-config-prog=FILENAME
file name of pkg-config for finding GTK and librsvg
--with-gameuser=USER user for shared game score files
@@ -4429,17 +4430,11 @@
## This is an option because I do not know if all info/man support
## compressed files, nor how to test if they do so.
-# Check whether --with-compress-info was given.
-if test "${with_compress_info+set}" = set; then :
- withval=$with_compress_info;
-else
- with_compress_info=$with_features
-fi
-
-if test $with_compress_info = yes; then
- GZIP_INFO=yes
-else
- GZIP_INFO=
+# Check whether --with-compress-install was given.
+if test "${with_compress_install+set}" = set; then :
+ withval=$with_compress_install;
+else
+ with_compress_install=$with_features
fi
@@ -8618,6 +8613,9 @@
+test $with_compress_install != yes && test -n "$GZIP_PROG" && \
+ GZIP_PROG=" # $GZIP_PROG # (disabled by configure
--without-compress-install)"
+
if test $opsys = gnu-linux; then
# Extract the first word of "paxctl", so it can be a program name with args.
set dummy paxctl; ac_word=$2
@@ -8783,11 +8781,13 @@
late_LDFLAGS=$LDFLAGS
if test x$GCC = xyes; then
- LDFLAGS="$LDFLAGS -Wl,-znocombreloc"
+ LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
else
- LDFLAGS="$LDFLAGS -znocombreloc"
+ LDFLAGS_NOCOMBRELOC="-znocombreloc"
fi
+LDFLAGS="$LDFLAGS $LDFLAGS_NOCOMBRELOC"
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -znocombreloc" >&5
$as_echo_n "checking for -znocombreloc... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8805,13 +8805,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- LDFLAGS=$late_LDFLAGS
+ LDFLAGS_NOCOMBRELOC=
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+LDFLAGS=$late_LDFLAGS
test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no
case "$opsys" in
@@ -29051,6 +29052,8 @@
esac
fi
+LD_SWITCH_SYSTEM_TEMACS="$LDFLAGS_NOCOMBRELOC $LD_SWITCH_SYSTEM_TEMACS"
+
## MinGW-specific post-link processing of temacs.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114177: Auto-commit of generated files.,
Glenn Morris <=