diff options
| author | Glenn Morris | 2012-05-10 06:17:25 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-05-10 06:17:25 -0400 |
| commit | ff4a64740df15b9e31121064b46d739b76a74e0d (patch) | |
| tree | bf714b85a0339d010fd956918d62ad08b2d55cef | |
| parent | 9f9aa0448aa1b5317d8903e33db1e3bb27e98ece (diff) | |
| download | emacs-ff4a64740df15b9e31121064b46d739b76a74e0d.tar.gz emacs-ff4a64740df15b9e31121064b46d739b76a74e0d.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 1 | ||||
| -rwxr-xr-x | autogen/configure | 4 |
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@ | |||
| 491 | LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ | 491 | LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ |
| 492 | LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ | 492 | LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ |
| 493 | LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ | 493 | LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ |
| 494 | LEIM_INSTALLDIR = @LEIM_INSTALLDIR@ | ||
| 494 | LIBGIF = @LIBGIF@ | 495 | LIBGIF = @LIBGIF@ |
| 495 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ | 496 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ |
| 496 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ | 497 | LIBGNUTLS_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 | |||
| 1163 | LIB_STANDARD | 1163 | LIB_STANDARD |
| 1164 | NS_OBJC_OBJ | 1164 | NS_OBJC_OBJ |
| 1165 | NS_OBJ | 1165 | NS_OBJ |
| 1166 | LEIM_INSTALLDIR | ||
| 1166 | TEMACS_LDFLAGS2 | 1167 | TEMACS_LDFLAGS2 |
| 1167 | LD_SWITCH_X_SITE_RPATH | 1168 | LD_SWITCH_X_SITE_RPATH |
| 1168 | XMKMF | 1169 | XMKMF |
| @@ -10422,6 +10423,7 @@ $as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h | |||
| 10422 | fi | 10423 | fi |
| 10423 | 10424 | ||
| 10424 | 10425 | ||
| 10426 | LEIM_INSTALLDIR="\${install_prefix}/leim" | ||
| 10425 | ns_frag=/dev/null | 10427 | ns_frag=/dev/null |
| 10426 | NS_OBJ= | 10428 | NS_OBJ= |
| 10427 | NS_OBJC_OBJ= | 10429 | NS_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 | |||
| 10452 | case "${window_system}" in | 10456 | case "${window_system}" in |
| 10453 | x11 ) | 10457 | x11 ) |
| 10454 | HAVE_X_WINDOWS=yes | 10458 | HAVE_X_WINDOWS=yes |