aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-10 06:17:25 -0400
committerGlenn Morris2012-05-10 06:17:25 -0400
commitff4a64740df15b9e31121064b46d739b76a74e0d (patch)
treebf714b85a0339d010fd956918d62ad08b2d55cef
parent9f9aa0448aa1b5317d8903e33db1e3bb27e98ece (diff)
downloademacs-ff4a64740df15b9e31121064b46d739b76a74e0d.tar.gz
emacs-ff4a64740df15b9e31121064b46d739b76a74e0d.zip
Auto-commit of generated files.
-rw-r--r--autogen/Makefile.in1
-rwxr-xr-xautogen/configure4
2 files changed, 5 insertions, 0 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index b28bf208694..ccf0b6ebd41 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -491,6 +491,7 @@ LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@
491LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ 491LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
492LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ 492LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
493LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ 493LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
494LEIM_INSTALLDIR = @LEIM_INSTALLDIR@
494LIBGIF = @LIBGIF@ 495LIBGIF = @LIBGIF@
495LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 496LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
496LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 497LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
diff --git a/autogen/configure b/autogen/configure
index ce3fb436009..b3b808e1f37 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1163,6 +1163,7 @@ HAVE_XSERVER
1163LIB_STANDARD 1163LIB_STANDARD
1164NS_OBJC_OBJ 1164NS_OBJC_OBJ
1165NS_OBJ 1165NS_OBJ
1166LEIM_INSTALLDIR
1166TEMACS_LDFLAGS2 1167TEMACS_LDFLAGS2
1167LD_SWITCH_X_SITE_RPATH 1168LD_SWITCH_X_SITE_RPATH
1168XMKMF 1169XMKMF
@@ -10422,6 +10423,7 @@ $as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h
10422fi 10423fi
10423 10424
10424 10425
10426LEIM_INSTALLDIR="\${install_prefix}/leim"
10425ns_frag=/dev/null 10427ns_frag=/dev/null
10426NS_OBJ= 10428NS_OBJ=
10427NS_OBJC_OBJ= 10429NS_OBJC_OBJ=
@@ -10437,6 +10439,7 @@ if test "${HAVE_NS}" = yes; then
10437 prefix=${ns_appresdir} 10439 prefix=${ns_appresdir}
10438 exec_prefix=${ns_appbindir} 10440 exec_prefix=${ns_appbindir}
10439 libexecdir=${ns_appbindir}/libexec 10441 libexecdir=${ns_appbindir}/libexec
10442 LEIM_INSTALLDIR="\${ns_appresdir}/leim"
10440 fi 10443 fi
10441 ns_frag=$srcdir/src/ns.mk 10444 ns_frag=$srcdir/src/ns.mk
10442 NS_OBJ="fontset.o fringe.o image.o" 10445 NS_OBJ="fontset.o fringe.o image.o"
@@ -10449,6 +10452,7 @@ CPPFLAGS="$tmp_CPPFLAGS"
10449 10452
10450 10453
10451 10454
10455
10452case "${window_system}" in 10456case "${window_system}" in
10453 x11 ) 10457 x11 )
10454 HAVE_X_WINDOWS=yes 10458 HAVE_X_WINDOWS=yes