diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-10 06:17:25 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-10 06:17:25 -0400 |
| commit | ff4a64740df15b9e31121064b46d739b76a74e0d (patch) | |
| tree | bf714b85a0339d010fd956918d62ad08b2d55cef /autogen | |
| parent | 9f9aa0448aa1b5317d8903e33db1e3bb27e98ece (diff) | |
| download | emacs-ff4a64740df15b9e31121064b46d739b76a74e0d.tar.gz | |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
| -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@ LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ +LEIM_INSTALLDIR = @LEIM_INSTALLDIR@ LIBGIF = @LIBGIF@ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 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 LIB_STANDARD NS_OBJC_OBJ NS_OBJ +LEIM_INSTALLDIR TEMACS_LDFLAGS2 LD_SWITCH_X_SITE_RPATH XMKMF @@ -10422,6 +10423,7 @@ $as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h fi +LEIM_INSTALLDIR="\${install_prefix}/leim" ns_frag=/dev/null NS_OBJ= NS_OBJC_OBJ= @@ -10437,6 +10439,7 @@ if test "${HAVE_NS}" = yes; then prefix=${ns_appresdir} exec_prefix=${ns_appbindir} libexecdir=${ns_appbindir}/libexec + LEIM_INSTALLDIR="\${ns_appresdir}/leim" fi ns_frag=$srcdir/src/ns.mk NS_OBJ="fontset.o fringe.o image.o" @@ -10449,6 +10452,7 @@ CPPFLAGS="$tmp_CPPFLAGS" + case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes |