diff options
| author | Glenn Morris | 2012-05-21 06:17:34 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-05-21 06:17:34 -0400 |
| commit | e1939eb1e4576b653c42c92497f795bea7c12084 (patch) | |
| tree | 43f290a396dac5dd793878232b7650a6a1869c96 | |
| parent | d71dfe75556b7bb4534bfaca0b7cf6cef563961e (diff) | |
| download | emacs-e1939eb1e4576b653c42c92497f795bea7c12084.tar.gz emacs-e1939eb1e4576b653c42c92497f795bea7c12084.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 2 | ||||
| -rwxr-xr-x | autogen/configure | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 956a8373684..a4d5f11ca9c 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in | |||
| @@ -492,7 +492,6 @@ LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@ | |||
| 492 | LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ | 492 | LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ |
| 493 | LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ | 493 | LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ |
| 494 | LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ | 494 | LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ |
| 495 | LEIM_INSTALLDIR = @LEIM_INSTALLDIR@ | ||
| 496 | LIBGIF = @LIBGIF@ | 495 | LIBGIF = @LIBGIF@ |
| 497 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ | 496 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ |
| 498 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ | 497 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ |
| @@ -755,6 +754,7 @@ htmldir = @htmldir@ | |||
| 755 | includedir = @includedir@ | 754 | includedir = @includedir@ |
| 756 | infodir = @infodir@ | 755 | infodir = @infodir@ |
| 757 | install_sh = @install_sh@ | 756 | install_sh = @install_sh@ |
| 757 | leimdir = @leimdir@ | ||
| 758 | libdir = @libdir@ | 758 | libdir = @libdir@ |
| 759 | libexecdir = @libexecdir@ | 759 | libexecdir = @libexecdir@ |
| 760 | liblockfile = @liblockfile@ | 760 | liblockfile = @liblockfile@ |
diff --git a/autogen/configure b/autogen/configure index c46e7717bb0..c6f7cde3711 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -1099,6 +1099,7 @@ etcdir | |||
| 1099 | x_default_search_path | 1099 | x_default_search_path |
| 1100 | lisppath | 1100 | lisppath |
| 1101 | locallisppath | 1101 | locallisppath |
| 1102 | leimdir | ||
| 1102 | lispdir | 1103 | lispdir |
| 1103 | srcdir | 1104 | srcdir |
| 1104 | canonical | 1105 | canonical |
| @@ -1164,7 +1165,6 @@ LIB_STANDARD | |||
| 1164 | NS_OBJC_OBJ | 1165 | NS_OBJC_OBJ |
| 1165 | NS_OBJ | 1166 | NS_OBJ |
| 1166 | ns_self_contained | 1167 | ns_self_contained |
| 1167 | LEIM_INSTALLDIR | ||
| 1168 | INSTALL_ARCH_INDEP_EXTRA | 1168 | INSTALL_ARCH_INDEP_EXTRA |
| 1169 | TEMACS_LDFLAGS2 | 1169 | TEMACS_LDFLAGS2 |
| 1170 | LD_SWITCH_X_SITE_RPATH | 1170 | LD_SWITCH_X_SITE_RPATH |
| @@ -3731,6 +3731,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | |||
| 3731 | 3731 | ||
| 3732 | 3732 | ||
| 3733 | lispdir='${datadir}/emacs/${version}/lisp' | 3733 | lispdir='${datadir}/emacs/${version}/lisp' |
| 3734 | leimdir='${datadir}/emacs/${version}/leim' | ||
| 3734 | locallisppath='${datadir}/emacs/${version}/site-lisp:'\ | 3735 | locallisppath='${datadir}/emacs/${version}/site-lisp:'\ |
| 3735 | '${datadir}/emacs/site-lisp' | 3736 | '${datadir}/emacs/site-lisp' |
| 3736 | lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' | 3737 | lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' |
| @@ -10109,7 +10110,6 @@ fi | |||
| 10109 | 10110 | ||
| 10110 | 10111 | ||
| 10111 | INSTALL_ARCH_INDEP_EXTRA=install-etc | 10112 | INSTALL_ARCH_INDEP_EXTRA=install-etc |
| 10112 | LEIM_INSTALLDIR="\${install_prefix}/leim" | ||
| 10113 | ns_self_contained=no | 10113 | ns_self_contained=no |
| 10114 | ns_frag=/dev/null | 10114 | ns_frag=/dev/null |
| 10115 | NS_OBJ= | 10115 | NS_OBJ= |
| @@ -10133,7 +10133,7 @@ if test "${HAVE_NS}" = yes; then | |||
| 10133 | infodir="\${ns_appresdir}/info" | 10133 | infodir="\${ns_appresdir}/info" |
| 10134 | mandir="\${ns_appresdir}/man" | 10134 | mandir="\${ns_appresdir}/man" |
| 10135 | lispdir="\${ns_appresdir}/lisp" | 10135 | lispdir="\${ns_appresdir}/lisp" |
| 10136 | LEIM_INSTALLDIR="\${ns_appresdir}/leim" | 10136 | leimdir="\${ns_appresdir}/leim" |
| 10137 | INSTALL_ARCH_INDEP_EXTRA= | 10137 | INSTALL_ARCH_INDEP_EXTRA= |
| 10138 | fi | 10138 | fi |
| 10139 | ns_frag=$srcdir/src/ns.mk | 10139 | ns_frag=$srcdir/src/ns.mk |
| @@ -10149,7 +10149,6 @@ CPPFLAGS="$tmp_CPPFLAGS" | |||
| 10149 | 10149 | ||
| 10150 | 10150 | ||
| 10151 | 10151 | ||
| 10152 | |||
| 10153 | case "${window_system}" in | 10152 | case "${window_system}" in |
| 10154 | x11 ) | 10153 | x11 ) |
| 10155 | HAVE_X_WINDOWS=yes | 10154 | HAVE_X_WINDOWS=yes |
| @@ -15992,6 +15991,7 @@ version=$PACKAGE_VERSION | |||
| 15992 | 15991 | ||
| 15993 | 15992 | ||
| 15994 | 15993 | ||
| 15994 | |||
| 15995 | ## FIXME? Nothing uses @LD_SWITCH_X_SITE@. | 15995 | ## FIXME? Nothing uses @LD_SWITCH_X_SITE@. |
| 15996 | ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the | 15996 | ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the |
| 15997 | ## end of LIBX_BASE, but nothing ever set it. | 15997 | ## end of LIBX_BASE, but nothing ever set it. |