Mercurial > hg > xemacs-beta

comparison configure @ 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 772c80e0e180
comparison
equal deleted inserted replaced
4454:1f0aa40cafe0 4455:49f8ed034500
777 EXEC_PREFIX 777 EXEC_PREFIX
778 INFODIR_USER_DEFINED 778 INFODIR_USER_DEFINED
779 INFODIR 779 INFODIR
780 infopath 780 infopath
781 INFOPATH_USER_DEFINED 781 INFOPATH_USER_DEFINED
782 INFOPATH
782 early_packages 783 early_packages
783 EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 784 EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
784 EARLY_PACKAGE_DIRECTORIES 785 EARLY_PACKAGE_DIRECTORIES
785 late_packages 786 late_packages
786 LATE_PACKAGE_DIRECTORIES_USER_DEFINED 787 LATE_PACKAGE_DIRECTORIES_USER_DEFINED
4546 case "$datadir_expanded" in 4547 case "$datadir_expanded" in
4547 *\$* ) eval "datadir_expanded=$datadir_expanded" ;; 4548 *\$* ) eval "datadir_expanded=$datadir_expanded" ;;
4548 *) break ;; 4549 *) break ;;
4549 esac 4550 esac
4550 done 4551 done
4551
4552 if test "x$datadir_expanded" != "x$prefix_expanded/share"
4553 then
4554 cat >>confdefs.h <<\_ACEOF
4555 #define INFODIR_USER_DEFINED 1
4556 _ACEOF
4557
4558 cat >>confdefs.h <<\_ACEOF
4559 #define LISPDIR_USER_DEFINED 1
4560 _ACEOF
4561
4562 cat >>confdefs.h <<\_ACEOF
4563 #define ETCDIR_USER_DEFINED 1
4564 _ACEOF
4565
4566 fi
4567
4568 if test "x$lib_expanded" != "x$prefix_expanded/lib"
4569 then
4570 cat >>confdefs.h <<\_ACEOF
4571 #define MODULEDIR_USER_DEFINED 1
4572 _ACEOF
4573
4574 cat >>confdefs.h <<\_ACEOF
4575 #define ARCHLIBDIR_USER_DEFINED 1
4576 _ACEOF
4577
4578 cat >>confdefs.h <<\_ACEOF
4579 #define DOCDIR_USER_DEFINED 1
4580 _ACEOF
4581
4582 fi
4583
4584 exec_prefix_expanded=$exec_prefix 4552 exec_prefix_expanded=$exec_prefix
4585 while true; do 4553 while true; do
4586 case "$exec_prefix_expanded" in 4554 case "$exec_prefix_expanded" in
4587 *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;; 4555 *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;;
4588 *) break ;; 4556 *) break ;;
4593 case "$libdir_expanded" in 4561 case "$libdir_expanded" in
4594 *\$* ) eval "libdir_expanded=$libdir_expanded" ;; 4562 *\$* ) eval "libdir_expanded=$libdir_expanded" ;;
4595 *) break ;; 4563 *) break ;;
4596 esac 4564 esac
4597 done 4565 done
4598
4599 if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib"
4600 then
4601 cat >>confdefs.h <<\_ACEOF
4602 #define ARCHLIBDIR_USER_DEFINED 1
4603 _ACEOF
4604
4605 fi
4606
4607 mandir_expanded=$mandir 4566 mandir_expanded=$mandir
4608 while true; do 4567 while true; do
4609 case "$mandir_expanded" in 4568 case "$mandir_expanded" in
4610 *\$* ) eval "mandir_expanded=$mandir_expanded" ;; 4569 *\$* ) eval "mandir_expanded=$mandir_expanded" ;;
4611 *) break ;; 4570 *) break ;;
4612 esac 4571 esac
4613 done 4572 done
4614
4615 if test "x$mandir_expanded" = "x$prefix_expanded/man"
4616 then
4617 mandir='${datarootdir}/man/man1'
4618 fi
4619
4620 infodir_expanded=$infodir 4573 infodir_expanded=$infodir
4621 while true; do 4574 while true; do
4622 case "$infodir_expanded" in 4575 case "$infodir_expanded" in
4623 *\$* ) eval "infodir_expanded=$infodir_expanded" ;; 4576 *\$* ) eval "infodir_expanded=$infodir_expanded" ;;
4624 *) break ;; 4577 *) break ;;
4625 esac 4578 esac
4626 done 4579 done
4627 4580
4628 if test "x$infodir_expanded" != "x${prefix_expanded}/info" 4581 if test "x$datadir_expanded" != "x$prefix_expanded/share"
4582 then
4583 cat >>confdefs.h <<\_ACEOF
4584 #define INFODIR_USER_DEFINED 1
4585 _ACEOF
4586
4587 cat >>confdefs.h <<\_ACEOF
4588 #define LISPDIR_USER_DEFINED 1
4589 _ACEOF
4590
4591 cat >>confdefs.h <<\_ACEOF
4592 #define ETCDIR_USER_DEFINED 1
4593 _ACEOF
4594
4595 fi
4596
4597 if test "x$libdir_expanded" != "x$prefix_expanded/lib"
4598 then
4599 cat >>confdefs.h <<\_ACEOF
4600 #define MODULEDIR_USER_DEFINED 1
4601 _ACEOF
4602
4603 cat >>confdefs.h <<\_ACEOF
4604 #define ARCHLIBDIR_USER_DEFINED 1
4605 _ACEOF
4606
4607 cat >>confdefs.h <<\_ACEOF
4608 #define DOCDIR_USER_DEFINED 1
4609 _ACEOF
4610
4611 fi
4612
4613 if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
4629 then 4614 then
4630 cat >>confdefs.h <<\_ACEOF 4615 cat >>confdefs.h <<\_ACEOF
4631 #define INFODIR_USER_DEFINED 1 4616 #define INFODIR_USER_DEFINED 1
4632 _ACEOF 4617 _ACEOF
4633 4618
39131 case "$INFOPATH" in 39116 case "$INFOPATH" in
39132 *\$* ) eval "INFOPATH=$INFOPATH" ;; 39117 *\$* ) eval "INFOPATH=$INFOPATH" ;;
39133 *) break ;; 39118 *) break ;;
39134 esac 39119 esac
39135 done 39120 done
39121
39136 39122
39137 test -n "$with_user_packages" && with_early_packages=$with_user_packages 39123 test -n "$with_user_packages" && with_early_packages=$with_user_packages
39138 early_packages=$with_early_packages 39124 early_packages=$with_early_packages
39139 39125
39140 39126
40574 EXEC_PREFIX!$EXEC_PREFIX$ac_delim 40560 EXEC_PREFIX!$EXEC_PREFIX$ac_delim
40575 INFODIR_USER_DEFINED!$INFODIR_USER_DEFINED$ac_delim 40561 INFODIR_USER_DEFINED!$INFODIR_USER_DEFINED$ac_delim
40576 INFODIR!$INFODIR$ac_delim 40562 INFODIR!$INFODIR$ac_delim
40577 infopath!$infopath$ac_delim 40563 infopath!$infopath$ac_delim
40578 INFOPATH_USER_DEFINED!$INFOPATH_USER_DEFINED$ac_delim 40564 INFOPATH_USER_DEFINED!$INFOPATH_USER_DEFINED$ac_delim
40565 INFOPATH!$INFOPATH$ac_delim
40579 early_packages!$early_packages$ac_delim 40566 early_packages!$early_packages$ac_delim
40580 EARLY_PACKAGE_DIRECTORIES_USER_DEFINED!$EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$ac_delim 40567 EARLY_PACKAGE_DIRECTORIES_USER_DEFINED!$EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$ac_delim
40581 EARLY_PACKAGE_DIRECTORIES!$EARLY_PACKAGE_DIRECTORIES$ac_delim 40568 EARLY_PACKAGE_DIRECTORIES!$EARLY_PACKAGE_DIRECTORIES$ac_delim
40582 late_packages!$late_packages$ac_delim 40569 late_packages!$late_packages$ac_delim
40583 LATE_PACKAGE_DIRECTORIES_USER_DEFINED!$LATE_PACKAGE_DIRECTORIES_USER_DEFINED$ac_delim 40570 LATE_PACKAGE_DIRECTORIES_USER_DEFINED!$LATE_PACKAGE_DIRECTORIES_USER_DEFINED$ac_delim
40630 internal_makefile_list!$internal_makefile_list$ac_delim 40617 internal_makefile_list!$internal_makefile_list$ac_delim
40631 LIBOBJS!$LIBOBJS$ac_delim 40618 LIBOBJS!$LIBOBJS$ac_delim
40632 LTLIBOBJS!$LTLIBOBJS$ac_delim 40619 LTLIBOBJS!$LTLIBOBJS$ac_delim
40633 _ACEOF 40620 _ACEOF
40634 40621
40635 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then 40622 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
40636 break 40623 break
40637 elif $ac_last_try; then 40624 elif $ac_last_try; then
40638 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 40625 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
40639 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} 40626 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
40640 { (exit 1); exit 1; }; } 40627 { (exit 1); exit 1; }; }