Mercurial > hg > xemacs-beta
diff configure @ 4557:790bd95b84c1
Automated merge with file:/Sources/xemacs-21.5-checked-out
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 13 May 2008 20:26:47 +0200 |
| parents | 49f8ed034500 |
| children | 772c80e0e180 |
line wrap: on
line diff
--- a/configure Sun May 11 19:50:49 2008 +0200 +++ b/configure Tue May 13 20:26:47 2008 +0200 @@ -779,6 +779,7 @@ INFODIR infopath INFOPATH_USER_DEFINED +INFOPATH early_packages EARLY_PACKAGE_DIRECTORIES_USER_DEFINED EARLY_PACKAGE_DIRECTORIES @@ -4548,6 +4549,34 @@ *) break ;; esac done +exec_prefix_expanded=$exec_prefix +while true; do + case "$exec_prefix_expanded" in + *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;; + *) break ;; + esac +done +libdir_expanded=$libdir +while true; do + case "$libdir_expanded" in + *\$* ) eval "libdir_expanded=$libdir_expanded" ;; + *) break ;; + esac +done +mandir_expanded=$mandir +while true; do + case "$mandir_expanded" in + *\$* ) eval "mandir_expanded=$mandir_expanded" ;; + *) break ;; + esac +done +infodir_expanded=$infodir +while true; do + case "$infodir_expanded" in + *\$* ) eval "infodir_expanded=$infodir_expanded" ;; + *) break ;; + esac +done if test "x$datadir_expanded" != "x$prefix_expanded/share" then @@ -4565,7 +4594,7 @@ fi -if test "x$lib_expanded" != "x$prefix_expanded/lib" +if test "x$libdir_expanded" != "x$prefix_expanded/lib" then cat >>confdefs.h <<\_ACEOF #define MODULEDIR_USER_DEFINED 1 @@ -4581,51 +4610,7 @@ fi -exec_prefix_expanded=$exec_prefix -while true; do - case "$exec_prefix_expanded" in - *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;; - *) break ;; - esac -done -libdir_expanded=$libdir -while true; do - case "$libdir_expanded" in - *\$* ) eval "libdir_expanded=$libdir_expanded" ;; - *) 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 - *\$* ) eval "mandir_expanded=$mandir_expanded" ;; - *) 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 - *\$* ) eval "infodir_expanded=$infodir_expanded" ;; - *) break ;; - esac -done - -if test "x$infodir_expanded" != "x${prefix_expanded}/info" +if test "x$infodir_expanded" != "x${prefix_expanded}/share/info" then cat >>confdefs.h <<\_ACEOF #define INFODIR_USER_DEFINED 1 @@ -39134,6 +39119,7 @@ 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 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 _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