Mercurial > hg > xemacs-beta

comparison configure.ac @ 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 ac6231e0c1df
children 86283c809984
comparison
equal deleted inserted replaced
4454:1f0aa40cafe0 4455:49f8ed034500
1066 esac 1066 esac
1067 done])dnl XE_EXPAND_VARIABLE 1067 done])dnl XE_EXPAND_VARIABLE
1068 1068
1069 XE_EXPAND_VARIABLE(prefix,prefix_expanded) 1069 XE_EXPAND_VARIABLE(prefix,prefix_expanded)
1070 XE_EXPAND_VARIABLE(datadir,datadir_expanded) 1070 XE_EXPAND_VARIABLE(datadir,datadir_expanded)
1071 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
1072 XE_EXPAND_VARIABLE(libdir,libdir_expanded)
1073 XE_EXPAND_VARIABLE(mandir,mandir_expanded)
1074 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
1071 1075
1072 if test "x$datadir_expanded" != "x$prefix_expanded/share" 1076 if test "x$datadir_expanded" != "x$prefix_expanded/share"
1073 then 1077 then
1074 AC_DEFINE(INFODIR_USER_DEFINED) 1078 AC_DEFINE(INFODIR_USER_DEFINED)
1075 AC_DEFINE(LISPDIR_USER_DEFINED) 1079 AC_DEFINE(LISPDIR_USER_DEFINED)
1076 AC_DEFINE(ETCDIR_USER_DEFINED) 1080 AC_DEFINE(ETCDIR_USER_DEFINED)
1077 fi 1081 fi
1078 1082
1079 if test "x$lib_expanded" != "x$prefix_expanded/lib" 1083 if test "x$libdir_expanded" != "x$prefix_expanded/lib"
1080 then 1084 then
1081 AC_DEFINE(MODULEDIR_USER_DEFINED) 1085 AC_DEFINE(MODULEDIR_USER_DEFINED)
1082 AC_DEFINE(ARCHLIBDIR_USER_DEFINED) 1086 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1083 AC_DEFINE(DOCDIR_USER_DEFINED) 1087 AC_DEFINE(DOCDIR_USER_DEFINED)
1084 fi 1088 fi
1085 1089
1086 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded) 1090 if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
1087 XE_EXPAND_VARIABLE(libdir,libdir_expanded)
1088
1089 if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib"
1090 then
1091 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1092 fi
1093
1094 XE_EXPAND_VARIABLE(mandir,mandir_expanded)
1095
1096 if test "x$mandir_expanded" = "x$prefix_expanded/man"
1097 then
1098 mandir='${datarootdir}/man/man1'
1099 fi
1100
1101 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
1102
1103 if test "x$infodir_expanded" != "x${prefix_expanded}/info"
1104 then 1091 then
1105 AC_DEFINE(INFODIR_USER_DEFINED) 1092 AC_DEFINE(INFODIR_USER_DEFINED)
1106 else 1093 else
1107 infodir='${datarootdir}/${instvardir}/info' 1094 infodir='${datarootdir}/${instvardir}/info'
1108 fi 1095 fi
5769 AC_SUBST(INFODIR) 5756 AC_SUBST(INFODIR)
5770 5757
5771 AC_SUBST(infopath,$with_infopath) 5758 AC_SUBST(infopath,$with_infopath)
5772 AC_SUBST(INFOPATH_USER_DEFINED) 5759 AC_SUBST(INFOPATH_USER_DEFINED)
5773 XE_EXPAND_VARIABLE(with_info_path,INFOPATH) 5760 XE_EXPAND_VARIABLE(with_info_path,INFOPATH)
5761 AC_SUBST(INFOPATH)
5774 5762
5775 test -n "$with_user_packages" && with_early_packages=$with_user_packages 5763 test -n "$with_user_packages" && with_early_packages=$with_user_packages
5776 AC_SUBST(early_packages,$with_early_packages) 5764 AC_SUBST(early_packages,$with_early_packages)
5777 AC_SUBST(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED) 5765 AC_SUBST(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)
5778 XE_EXPAND_VARIABLE(with_early_packages,EARLY_PACKAGE_DIRECTORIES) 5766 XE_EXPAND_VARIABLE(with_early_packages,EARLY_PACKAGE_DIRECTORIES)