Mercurial > hg > xemacs-beta

comparison configure.ac @ 3729:96cba27916dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-12-08 07:39:22 by michaels] 2006-11-23 Mike Sperber <mike@xemacs.org> * configure.ac (XE_EXPAND_VARIABLE): Fully expand the various directories before comparing them for figuring out which of them are user-defined. Use XE_EPXAND_VARIABLE macro created for this purpose where applicable.
author michaels
date Fri, 08 Dec 2006 07:39:23 +0000
parents 3246cf3e564d
children 23dd32cedb6a
comparison
equal deleted inserted replaced
3728:6765f2581182 3729:96cba27916dd
1049 then 1049 then
1050 exec_prefix='${prefix}' 1050 exec_prefix='${prefix}'
1051 else 1051 else
1052 AC_DEFINE(EXEC_PREFIX_USER_DEFINED) 1052 AC_DEFINE(EXEC_PREFIX_USER_DEFINED)
1053 fi 1053 fi
1054 if test "x$datadir" != 'x${prefix}/share' 1054
1055 define([XE_EXPAND_VARIABLE],
1056 [$2=[$]$1
1057 while true; do
1058 case "[$]$2" in
1059 *\[$]* ) eval "$2=[$]$2" ;;
1060 *) break ;;
1061 esac
1062 done])dnl XE_EXPAND_VARIABLE
1063
1064 XE_EXPAND_VARIABLE(prefix,prefix_expanded)
1065 XE_EXPAND_VARIABLE(datadir,datadir_expanded)
1066
1067 if test "x$datadir_expanded" != "x$prefix_expanded/share"
1055 then 1068 then
1056 AC_DEFINE(INFODIR_USER_DEFINED) 1069 AC_DEFINE(INFODIR_USER_DEFINED)
1057 AC_DEFINE(LISPDIR_USER_DEFINED) 1070 AC_DEFINE(LISPDIR_USER_DEFINED)
1058 AC_DEFINE(MODULEDIR_USER_DEFINED) 1071 AC_DEFINE(MODULEDIR_USER_DEFINED)
1059 AC_DEFINE(ETCDIR_USER_DEFINED) 1072 AC_DEFINE(ETCDIR_USER_DEFINED)
1060 AC_DEFINE(DOCDIR_USER_DEFINED) 1073 AC_DEFINE(DOCDIR_USER_DEFINED)
1061 AC_DEFINE(ARCHLIBDIR_USER_DEFINED) 1074 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1062 else 1075 else
1063 datadir='${prefix}/lib' 1076 datadir='${prefix}/lib'
1064 fi 1077 fi
1065 if test "x$libdir" != 'x${exec_prefix}/lib' 1078
1079 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
1080 XE_EXPAND_VARIABLE(libdir,libdir_expanded)
1081
1082 if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib"
1066 then 1083 then
1067 AC_DEFINE(ARCHLIBDIR_USER_DEFINED) 1084 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1068 fi 1085 fi
1069 if test "x$mandir" = 'x${prefix}/man' 1086
1087 XE_EXPAND_VARIABLE(mandir,mandir_expanded)
1088
1089 if test "x$mandir_expanded" = "x$prefix_expanded/man"
1070 then 1090 then
1071 mandir='${prefix}/man/man1' 1091 mandir='${prefix}/man/man1'
1072 fi 1092 fi
1073 if test "x$infodir" != 'x${prefix}/info' 1093
1094 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
1095
1096 if test "x$infodir_expanded" != "x${prefix_expanded}/info"
1074 then 1097 then
1075 AC_DEFINE(INFODIR_USER_DEFINED) 1098 AC_DEFINE(INFODIR_USER_DEFINED)
1076 else 1099 else
1077 infodir='${datadir}/${instvardir}/info' 1100 infodir='${datadir}/${instvardir}/info'
1078 fi 1101 fi
5660 done 5683 done
5661 AC_SUBST(EXEC_PREFIX) 5684 AC_SUBST(EXEC_PREFIX)
5662 5685
5663 AC_SUBST(infodir) 5686 AC_SUBST(infodir)
5664 AC_SUBST(INFODIR_USER_DEFINED) 5687 AC_SUBST(INFODIR_USER_DEFINED)
5665 INFODIR=$infodir 5688 XE_EXPAND_VARIABLE(infodir,INFODIR)
5666 while true; do
5667 case "$INFODIR" in
5668 *\$* ) eval "INFODIR=$INFODIR" ;;
5669 *) break ;;
5670 esac
5671 done
5672 AC_SUBST(INFODIR) 5689 AC_SUBST(INFODIR)
5673 5690
5674 AC_SUBST(infopath,$with_infopath) 5691 AC_SUBST(infopath,$with_infopath)
5675 AC_SUBST(INFOPATH_USER_DEFINED) 5692 AC_SUBST(INFOPATH_USER_DEFINED)
5676 INFOPATH=$with_infopath 5693 XE_EXPAND_VARIABLE(with_info_path,INFOPATH)
5677 while true; do
5678 case "$INFOPATH" in
5679 *\$* ) eval "INFOPATH=$INFOPATH" ;;
5680 *) break ;;
5681 esac
5682 done
5683 AC_SUBST(INFOPATH)
5684 5694
5685 test -n "$with_user_packages" && with_early_packages=$with_user_packages 5695 test -n "$with_user_packages" && with_early_packages=$with_user_packages
5686 AC_SUBST(early_packages,$with_early_packages) 5696 AC_SUBST(early_packages,$with_early_packages)
5687 AC_SUBST(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED) 5697 AC_SUBST(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)
5688 EARLY_PACKAGE_DIRECTORIES=$with_early_packages 5698 XE_EXPAND_VARIABLE(with_early_packages,EARLY_PACKAGE_DIRECTORIES)
5689 while true; do
5690 case "$EARLY_PACKAGE_DIRECTORIES" in
5691 *\$* ) eval "EARLY_PACKAGE_DIRECTORIES=$EARLY_PACKAGE_DIRECTORIES" ;;
5692 *) break ;;
5693 esac
5694 done
5695 AC_SUBST(EARLY_PACKAGE_DIRECTORIES) 5699 AC_SUBST(EARLY_PACKAGE_DIRECTORIES)
5696 5700
5697 test -n "$with_system_packages" && with_late_packages=$with_system_packages 5701 test -n "$with_system_packages" && with_late_packages=$with_system_packages
5698 AC_SUBST(late_packages,$with_late_packages) 5702 AC_SUBST(late_packages,$with_late_packages)
5699 AC_SUBST(LATE_PACKAGE_DIRECTORIES_USER_DEFINED) 5703 AC_SUBST(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)
5700 LATE_PACKAGE_DIRECTORIES=$with_late_packages 5704 XE_EXPAND_VARIABLE(with_late_packages,LATE_PACKAGE_DIRECTORIES)
5701 while true; do
5702 case "$LATE_PACKAGE_DIRECTORIES" in
5703 *\$* ) eval "LATE_PACKAGE_DIRECTORIES=$LATE_PACKAGE_DIRECTORIES" ;;
5704 *) break ;;
5705 esac
5706 done
5707 AC_SUBST(LATE_PACKAGE_DIRECTORIES) 5705 AC_SUBST(LATE_PACKAGE_DIRECTORIES)
5708 5706
5709 test -n "$with_legacy_packages" && with_last_packages=$with_legacy_packages 5707 test -n "$with_legacy_packages" && with_last_packages=$with_legacy_packages
5710 AC_SUBST(last_packages,$with_last_packages) 5708 AC_SUBST(last_packages,$with_last_packages)
5711 AC_SUBST(LAST_PACKAGE_DIRECTORIES_USER_DEFINED) 5709 AC_SUBST(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)
5712 LAST_PACKAGE_DIRECTORIES=$with_last_packages 5710 XE_EXPAND_VARIABLE(with_last_packages,LAST_PACKAGE_DIRECTORIES)
5713 while true; do
5714 case "$LAST_PACKAGE_DIRECTORIES" in
5715 *\$* ) eval "LAST_PACKAGE_DIRECTORIES=$LAST_PACKAGE_DIRECTORIES" ;;
5716 *) break ;;
5717 esac
5718 done
5719 AC_SUBST(LAST_PACKAGE_DIRECTORIES) 5711 AC_SUBST(LAST_PACKAGE_DIRECTORIES)
5720 5712
5721 AC_SUBST(package_path,$with_package_path) 5713 AC_SUBST(package_path,$with_package_path)
5722 AC_SUBST(PACKAGE_PATH_USER_DEFINED) 5714 AC_SUBST(PACKAGE_PATH_USER_DEFINED)
5723 PACKAGE_PATH=$with_package_path 5715 XE_EXPAND_VARIABLE(with_package_path,PACKAGE_PATH)
5724 while true; do
5725 case "$PACKAGE_PATH" in
5726 *\$* ) eval "PACKAGE_PATH=$PACKAGE_PATH" ;;
5727 *) break ;;
5728 esac
5729 done
5730 AC_SUBST(PACKAGE_PATH) 5716 AC_SUBST(PACKAGE_PATH)
5731 5717
5732 AC_SUBST(lispdir, $with_lispdir) 5718 AC_SUBST(lispdir, $with_lispdir)
5733 AC_SUBST(LISPDIR_USER_DEFINED) 5719 AC_SUBST(LISPDIR_USER_DEFINED)
5734 LISPDIR=$with_lispdir 5720 XE_EXPAND_VARIABLE(with_lispdir,LISPDIR)
5735 while true; do
5736 case "$LISPDIR" in
5737 *\$* ) eval "LISPDIR=$LISPDIR" ;;
5738 *) break ;;
5739 esac
5740 done
5741 AC_SUBST(LISPDIR) 5721 AC_SUBST(LISPDIR)
5742 5722
5743 AC_SUBST(moduledir,$with_moduledir) 5723 AC_SUBST(moduledir,$with_moduledir)
5744 AC_SUBST(MODULEDIR_USER_DEFINED) 5724 AC_SUBST(MODULEDIR_USER_DEFINED)
5745 MODULEDIR=$with_moduledir 5725 XE_EXPAND_VARIABLE(with_moduledir,MODULEDIR)
5746 while true; do
5747 case "$MODULEDIR" in
5748 *\$* ) eval "MODULEDIR=$MODULEDIR" ;;
5749 *) break ;;
5750 esac
5751 done
5752 AC_SUBST(MODULEDIR) 5726 AC_SUBST(MODULEDIR)
5753 5727
5754 AC_SUBST(sitelispdir,$with_sitelispdir) 5728 AC_SUBST(sitelispdir,$with_sitelispdir)
5755 AC_SUBST(SITELISPDIR_USER_DEFINED) 5729 AC_SUBST(SITELISPDIR_USER_DEFINED)
5756 SITELISPDIR=$sitelispdir 5730 XE_EXPAND_VARIABLE(sitelispdir,SITELISPDIR)
5757 while true; do
5758 case "$SITELISPDIR" in
5759 *\$* ) eval "SITELISPDIR=$SITELISPDIR" ;;
5760 *) break ;;
5761 esac
5762 done
5763 AC_SUBST(SITELISPDIR) 5731 AC_SUBST(SITELISPDIR)
5764 5732
5765 AC_SUBST(sitemoduledir) 5733 AC_SUBST(sitemoduledir)
5766 AC_SUBST(SITEMODULEDIR_USER_DEFINED) 5734 AC_SUBST(SITEMODULEDIR_USER_DEFINED)
5767 SITEMODULEDIR=$sitemoduledir 5735 XE_EXPAND_VARIABLE(sitemoduledir,SITEMODULEDIR)
5768 while true; do
5769 case "$SITEMODULEDIR" in
5770 *\$* ) eval "SITEMODULEDIR=$SITEMODULEDIR" ;;
5771 *) break ;;
5772 esac
5773 done
5774 AC_SUBST(SITEMODULEDIR) 5736 AC_SUBST(SITEMODULEDIR)
5775 5737
5776 AC_SUBST(etcdir,$with_etcdir) 5738 AC_SUBST(etcdir,$with_etcdir)
5777 AC_SUBST(ETCDIR_USER_DEFINED) 5739 AC_SUBST(ETCDIR_USER_DEFINED)
5778 ETCDIR=$with_etcdir 5740 XE_EXPAND_VARIABLE(with_etcdir,ETCDIR)
5779 while true; do
5780 case "$ETCDIR" in
5781 *\$* ) eval "ETCDIR=$ETCDIR" ;;
5782 *) break ;;
5783 esac
5784 done
5785 AC_SUBST(ETCDIR) 5741 AC_SUBST(ETCDIR)
5786 5742
5787 AC_SUBST(archlibdir,$with_archlibdir) 5743 AC_SUBST(archlibdir,$with_archlibdir)
5788 AC_SUBST(ARCHLIBDIR_USER_DEFINED) 5744 AC_SUBST(ARCHLIBDIR_USER_DEFINED)
5789 ARCHLIBDIR=$with_archlibdir 5745 ARCHLIBDIR=$with_archlibdir
5790 while true; do 5746 XE_EXPAND_VARIABLE(with_archlibdir,ARCHLIBDIR)
5791 case "$ARCHLIBDIR" in
5792 *\$* ) eval "ARCHLIBDIR=$ARCHLIBDIR" ;;
5793 *) break ;;
5794 esac
5795 done
5796 AC_SUBST(ARCHLIBDIR) 5747 AC_SUBST(ARCHLIBDIR)
5797 5748
5798 AC_SUBST(docdir,$with_docdir) 5749 AC_SUBST(docdir,$with_docdir)
5799 AC_SUBST(DOCDIR_USER_DEFINED) 5750 AC_SUBST(DOCDIR_USER_DEFINED)
5800 DOCDIR=$with_docdir 5751 XE_EXPAND_VARIABLE(with_docdir,DOCDIR)
5801 while true; do
5802 case "$DOCDIR" in
5803 *\$* ) eval "DOCDIR=$DOCDIR" ;;
5804 *) break ;;
5805 esac
5806 done
5807 AC_SUBST(DOCDIR) 5752 AC_SUBST(DOCDIR)
5808 5753
5809 AC_SUBST(docdir) 5754 AC_SUBST(docdir)
5810 AC_SUBST(bitmapdir) 5755 AC_SUBST(bitmapdir)
5811 AC_SUBST(extra_objs) 5756 AC_SUBST(extra_objs)