Mercurial > hg > xemacs-beta

changeset 4455:49f8ed034500

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix path-configuration glitches: 2008-05-12 Michael Sperber <mike@xemacs.org> * 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.
author Mike Sperber <sperber@deinprogramm.de>
date Mon, 12 May 2008 11:53:04 +0200
parents 1f0aa40cafe0
children c785f98c6737
files ChangeLog configure configure.ac
diffstat 3 files changed, 48 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- 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-12  Michael Sperber  <mike@xemacs.org>
+
+	* 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@parhasard.net>
 
 	* configure.ac (XE_EXPAND_VARIABLE): Call AC_SUBST on
--- 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
 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
--- 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 @@
 
 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 @@
   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_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)