Mercurial > hg > xemacs-beta

comparison configure.ac @ 4660:32be564c53dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More accurate tests for explicitly-set paths.
author Mike Sperber <sperber@deinprogramm.de>
date Tue, 28 Jul 2009 15:09:05 +0200
parents 79d1a0524b5f
children 24224362882c
comparison
equal deleted inserted replaced
4659:e73b6e513092 4660:32be564c53dd
1073 1073
1074 XE_EXPAND_VARIABLE(prefix,prefix_expanded) 1074 XE_EXPAND_VARIABLE(prefix,prefix_expanded)
1075 XE_EXPAND_VARIABLE(datadir,datadir_expanded) 1075 XE_EXPAND_VARIABLE(datadir,datadir_expanded)
1076 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded) 1076 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
1077 XE_EXPAND_VARIABLE(libdir,libdir_expanded) 1077 XE_EXPAND_VARIABLE(libdir,libdir_expanded)
1078 XE_EXPAND_VARIABLE(mandir,mandir_expanded)
1079 XE_EXPAND_VARIABLE(infodir,infodir_expanded) 1078 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
1080 1079
1081 if test "x$datadir_expanded" != "x$prefix_expanded/share" 1080 if test "x$datadir" != "x\${datarootdir}"
1082 then 1081 then
1083 AC_DEFINE(INFODIR_USER_DEFINED) 1082 AC_DEFINE(INFODIR_USER_DEFINED)
1084 AC_DEFINE(LISPDIR_USER_DEFINED) 1083 AC_DEFINE(LISPDIR_USER_DEFINED)
1085 AC_DEFINE(ETCDIR_USER_DEFINED) 1084 AC_DEFINE(ETCDIR_USER_DEFINED)
1086 fi 1085 fi
1087 1086
1088 if test "x$libdir_expanded" != "x$prefix_expanded/lib" 1087 if test "x$libdir" != "x\${exec_prefix}/lib"
1089 then 1088 then
1090 AC_DEFINE(MODULEDIR_USER_DEFINED) 1089 AC_DEFINE(MODULEDIR_USER_DEFINED)
1091 AC_DEFINE(ARCHLIBDIR_USER_DEFINED) 1090 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1092 AC_DEFINE(DOCDIR_USER_DEFINED) 1091 AC_DEFINE(DOCDIR_USER_DEFINED)
1093 fi 1092 fi
1094 1093
1095 if test "x$infodir_expanded" != "x${prefix_expanded}/share/info" 1094 if test "x$infodir" != "x\${datarootdir}/info"
1096 then 1095 then
1097 AC_DEFINE(INFODIR_USER_DEFINED) 1096 AC_DEFINE(INFODIR_USER_DEFINED)
1098 else 1097 else
1099 infodir='${datarootdir}/${instvardir}/info' 1098 infodir='${datarootdir}/${instvardir}/info'
1100 fi 1099 fi
5744 AC_SUBST(mandir) 5743 AC_SUBST(mandir)
5745 AC_SUBST(extra_includes) 5744 AC_SUBST(extra_includes)
5746 5745
5747 AC_SUBST(prefix) 5746 AC_SUBST(prefix)
5748 AC_SUBST(PREFIX_USER_DEFINED) 5747 AC_SUBST(PREFIX_USER_DEFINED)
5749 dnl Yo, Stephen Bourne! I want to marry you! 5748 XE_EXPAND_VARIABLE(prefix,PREFIX)
5750 PREFIX=$prefix
5751 while true; do
5752 case "$PREFIX" in
5753 *\$* ) eval "PREFIX=$PREFIX" ;;
5754 *) break ;;
5755 esac
5756 done
5757 AC_SUBST(PREFIX)
5758 5749
5759 AC_SUBST(exec_prefix) 5750 AC_SUBST(exec_prefix)
5760 AC_SUBST(EXEC_PREFIX_USER_DEFINED) 5751 AC_SUBST(EXEC_PREFIX_USER_DEFINED)
5761 EXEC_PREFIX=$exec_prefix 5752 XE_EXPAND_VARIABLE(exec_prefix,EXEC_PREFIX)
5762 while true; do
5763 case "$EXEC_PREFIX" in
5764 *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;;
5765 *) break ;;
5766 esac
5767 done
5768 AC_SUBST(EXEC_PREFIX) 5753 AC_SUBST(EXEC_PREFIX)
5769 5754
5770 AC_SUBST(infodir) 5755 AC_SUBST(infodir)
5771 AC_SUBST(INFODIR_USER_DEFINED) 5756 AC_SUBST(INFODIR_USER_DEFINED)
5772 XE_EXPAND_VARIABLE(infodir,INFODIR) 5757 XE_EXPAND_VARIABLE(infodir,INFODIR)