commit: Fix path-configuration glitches:

changeset: 4455:49f8ed0345005a02146572b11bdb55f0127d3bf2 tag: tip user: Mike Sperber <sperber(a)deinprogramm.de&gt; date: Mon May 12 11:53:04 2008 +0200 files: ChangeLog configure configure.ac description: Fix path-configuration glitches: 2008-05-12 Michael Sperber <mike(a)xemacs.org&gt; * configure.ac: A number of the checks that tried to determine whether an explicit path was specified were wrong. Also, add an AC_SUBST for INFOPATH. diff -r 1f0aa40cafe090edac8b2a0584e86050da240da7 -r 49f8ed0345005a02146572b11bdb55f0127d3bf2 ChangeLog --- a/ChangeLog Sun May 11 12:03:07 2008 +0200 +++ b/ChangeLog Mon May 12 11:53:04 2008 +0200 ＠＠ -1,3 +1,10 ＠＠ 2008-05-07 Aidan Kehoe <kehoea＠parhasa +2008-05-12 Michael Sperber <mike(a)xemacs.org&gt; + + * configure.ac: + A number of the checks that tried to determine whether an explicit + path was specified were wrong. + Also, add an AC_SUBST for INFOPATH. + 2008-05-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure.ac (XE_EXPAND_VARIABLE): Call AC_SUBST on diff -r 1f0aa40cafe090edac8b2a0584e86050da240da7 -r 49f8ed0345005a02146572b11bdb55f0127d3bf2 configure --- a/configure Sun May 11 12:03:07 2008 +0200 +++ b/configure Mon May 12 11:53:04 2008 +0200 ＠＠ -779,6 +779,7 ＠＠ INFODIR INFODIR infopath INFOPATH_USER_DEFINED +INFOPATH early_packages EARLY_PACKAGE_DIRECTORIES_USER_DEFINED EARLY_PACKAGE_DIRECTORIES ＠＠ -4548,39 +4549,6 ＠＠ while true; do *) break ;; esac done - -if test "x$datadir_expanded" != "x$prefix_expanded/share" -then - cat >>confdefs.h <<\_ACEOF -#define INFODIR_USER_DEFINED 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define LISPDIR_USER_DEFINED 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define ETCDIR_USER_DEFINED 1 -_ACEOF - -fi - -if test "x$lib_expanded" != "x$prefix_expanded/lib" -then - cat >>confdefs.h <<\_ACEOF -#define MODULEDIR_USER_DEFINED 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define ARCHLIBDIR_USER_DEFINED 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define DOCDIR_USER_DEFINED 1 -_ACEOF - -fi - exec_prefix_expanded=$exec_prefix while true; do case "$exec_prefix_expanded" in ＠＠ -4595,15 +4563,6 ＠＠ while true; do *) break ;; esac done - -if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib" -then - cat >>confdefs.h <<\_ACEOF -#define ARCHLIBDIR_USER_DEFINED 1 -_ACEOF - -fi - mandir_expanded=$mandir while true; do case "$mandir_expanded" in ＠＠ -4611,12 +4570,6 ＠＠ while true; do *) break ;; esac done - -if test "x$mandir_expanded" = "x$prefix_expanded/man" -then - mandir='${datarootdir}/man/man1' -fi - infodir_expanded=$infodir while true; do case "$infodir_expanded" in ＠＠ -4625,7 +4578,39 ＠＠ while true; do esac done -if test "x$infodir_expanded" != "x${prefix_expanded}/info" +if test "x$datadir_expanded" != "x$prefix_expanded/share" +then + cat >>confdefs.h <<\_ACEOF +#define INFODIR_USER_DEFINED 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define LISPDIR_USER_DEFINED 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define ETCDIR_USER_DEFINED 1 +_ACEOF + +fi + +if test "x$libdir_expanded" != "x$prefix_expanded/lib" +then + cat >>confdefs.h <<\_ACEOF +#define MODULEDIR_USER_DEFINED 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define ARCHLIBDIR_USER_DEFINED 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define DOCDIR_USER_DEFINED 1 +_ACEOF + +fi + +if test "x$infodir_expanded" != "x${prefix_expanded}/share/info" then cat >>confdefs.h <<\_ACEOF #define INFODIR_USER_DEFINED 1 ＠＠ -39133,6 +39118,7 ＠＠ while true; do *) break ;; esac done + test -n "$with_user_packages" && with_early_packages=$with_user_packages early_packages=$with_early_packages ＠＠ -40576,6 +40562,7 ＠＠ INFODIR!$INFODIR$ac_delim INFODIR!$INFODIR$ac_delim infopath!$infopath$ac_delim INFOPATH_USER_DEFINED!$INFOPATH_USER_DEFINED$ac_delim +INFOPATH!$INFOPATH$ac_delim early_packages!$early_packages$ac_delim EARLY_PACKAGE_DIRECTORIES_USER_DEFINED!$EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$ac_delim EARLY_PACKAGE_DIRECTORIES!$EARLY_PACKAGE_DIRECTORIES$ac_delim ＠＠ -40632,7 +40619,7 ＠＠ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -r 1f0aa40cafe090edac8b2a0584e86050da240da7 -r 49f8ed0345005a02146572b11bdb55f0127d3bf2 configure.ac --- a/configure.ac Sun May 11 12:03:07 2008 +0200 +++ b/configure.ac Mon May 12 11:53:04 2008 +0200 ＠＠ -1068,6 +1068,10 ＠＠ done])dnl XE_EXPAND_VARIABLE XE_EXPAND_VARIABLE(prefix,prefix_expanded) XE_EXPAND_VARIABLE(datadir,datadir_expanded) +XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded) +XE_EXPAND_VARIABLE(libdir,libdir_expanded) +XE_EXPAND_VARIABLE(mandir,mandir_expanded) +XE_EXPAND_VARIABLE(infodir,infodir_expanded) if test "x$datadir_expanded" != "x$prefix_expanded/share" then ＠＠ -1076,31 +1080,14 ＠＠ then AC_DEFINE(ETCDIR_USER_DEFINED) fi -if test "x$lib_expanded" != "x$prefix_expanded/lib" +if test "x$libdir_expanded" != "x$prefix_expanded/lib" then AC_DEFINE(MODULEDIR_USER_DEFINED) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) AC_DEFINE(DOCDIR_USER_DEFINED) fi -XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded) -XE_EXPAND_VARIABLE(libdir,libdir_expanded) - -if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib" -then - AC_DEFINE(ARCHLIBDIR_USER_DEFINED) -fi - -XE_EXPAND_VARIABLE(mandir,mandir_expanded) - -if test "x$mandir_expanded" = "x$prefix_expanded/man" -then - mandir='${datarootdir}/man/man1' -fi - -XE_EXPAND_VARIABLE(infodir,infodir_expanded) - -if test "x$infodir_expanded" != "x${prefix_expanded}/info" +if test "x$infodir_expanded" != "x${prefix_expanded}/share/info" then AC_DEFINE(INFODIR_USER_DEFINED) else ＠＠ -5771,6 +5758,7 ＠＠ AC_SUBST(infopath,$with_infopath) AC_SUBST(infopath,$with_infopath) AC_SUBST(INFOPATH_USER_DEFINED) XE_EXPAND_VARIABLE(with_info_path,INFOPATH) +AC_SUBST(INFOPATH) test -n "$with_user_packages" && with_early_packages=$with_user_packages AC_SUBST(early_packages,$with_early_packages) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches