comparison configure.in @ 269:b2472a1930f2 r20-5b33

Import from CVS: tag r20-5b33
author cvs
date Mon, 13 Aug 2007 10:27:19 +0200
parents 966663fcf606
children c5d627a313b1
comparison
equal deleted inserted replaced
268:6ced69ccd85f 269:b2472a1930f2
327 infodir_user_defined='no' 327 infodir_user_defined='no'
328 dnl BETA NOTE: ! Will you please add to this list? Nonexistent dirs 328 dnl BETA NOTE: ! Will you please add to this list? Nonexistent dirs
329 dnl are dropped from the list at runtime, so it is safe to add 329 dnl are dropped from the list at runtime, so it is safe to add
330 dnl directories to this list that you don't have at home. 330 dnl directories to this list that you don't have at home.
331 infopath='/usr/local/lib/texmf/doc/info:/usr/local/lib/texmf/info:/usr/lib/texmf/doc/info:/usr/lib/texmf/info:/usr/local/info:/usr/info' 331 infopath='/usr/local/lib/texmf/doc/info:/usr/local/lib/texmf/info:/usr/lib/texmf/doc/info:/usr/lib/texmf/info:/usr/local/info:/usr/info'
332 infopath_user_defined='no'
333 lispdir='${datadir}/xemacs-${version}/lisp' 332 lispdir='${datadir}/xemacs-${version}/lisp'
334 lispdir_user_defined='no' 333 lispdir_user_defined='no'
335 sitelispdir='${datadir}/xemacs/site-lisp' 334 sitelispdir='${datadir}/xemacs/site-lisp'
336 sitelispdir_user_defined='no' 335 sitelispdir_user_defined='no'
337 packagepath='~/.xemacs::${datadir}/xemacs/mule-packages:${datadir}/xemacs-${version}/mule-packages:${datadir}/xemacs/packages:${datadir}/xemacs-${version}/packages' 336 pkgdir='${datadir}/xemacs-${version}/lisp'
338 packagepath_user_defined='no' 337 package_path='~/.xemacs::${datadir}/xemacs-${version}/mule-packages:${datadir}/xemacs/mule-packages:${datadir}/xemacs-${version}/packages:${datadir}/xemacs/packages'
338 package_path_user_defined='no'
339 etcdir='${datadir}/xemacs-${version}/etc' 339 etcdir='${datadir}/xemacs-${version}/etc'
340 etcdir_user_defined='no' 340 etcdir_user_defined='no'
341 lockdir='${statedir}/xemacs/lock' 341 lockdir='${statedir}/xemacs/lock'
342 lockdir_user_defined='no' 342 lockdir_user_defined='no'
343 archlibdir='${libdir}/xemacs-${version}/${configuration}' 343 archlibdir='${libdir}/xemacs-${version}/${configuration}'
344 archlibdir_user_defined='no' 344 archlibdir_user_defined='no'
345 with_site_lisp='yes' 345 with_site_lisp='no'
346 with_menubars='' 346 with_menubars=''
347 with_scrollbars='' 347 with_scrollbars=''
348 with_dialogs='' 348 with_dialogs=''
349 with_file_coding='' 349 with_file_coding=''
350 const_is_losing='yes' 350 const_is_losing='yes'
446 dnl Process the option. 446 dnl Process the option.
447 case "$opt" in 447 case "$opt" in
448 448
449 dnl Process (many) boolean options 449 dnl Process (many) boolean options
450 run_in_place | \ 450 run_in_place | \
451 with_site_lisp | \
451 with_x | \ 452 with_x | \
452 with_x11 | \ 453 with_x11 | \
453 with_msw | \ 454 with_msw | \
454 with_gcc | \ 455 with_gcc | \
455 with_gnu_make | \ 456 with_gnu_make | \
681 dnl installed in odd places. 682 dnl installed in odd places.
682 683
683 dnl Has the user specified one of the path options? 684 dnl Has the user specified one of the path options?
684 prefix | exec_prefix | bindir | datadir | statedir | libdir | \ 685 prefix | exec_prefix | bindir | datadir | statedir | libdir | \
685 mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \ 686 mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \
686 archlibdir | sitelispdir | docdir | packagepath ) 687 archlibdir | sitelispdir | docdir | package_path )
687 dnl If the value was omitted, get it from the next argument. 688 dnl If the value was omitted, get it from the next argument.
688 if test "$valomitted" = "yes"; then 689 if test "$valomitted" = "yes"; then
689 if test "$#" = 0; then 690 if test "$#" = 0; then
690 USAGE_ERROR("The \`--$optname' option requires a value."); 691 USAGE_ERROR("The \`--$optname' option requires a value.");
691 fi 692 fi
700 case "$opt" in 701 case "$opt" in
701 lispdir ) lispdir_user_defined=yes ;; 702 lispdir ) lispdir_user_defined=yes ;;
702 sitelispdir ) sitelispdir_user_defined=yes ;; 703 sitelispdir ) sitelispdir_user_defined=yes ;;
703 etcdir ) etcdir_user_defined=yes ;; 704 etcdir ) etcdir_user_defined=yes ;;
704 infodir ) infodir_user_defined=yes ;; 705 infodir ) infodir_user_defined=yes ;;
705 infopath ) infopath_user_defined=yes ;; 706 package_path ) package_path_user_defined=yes ;;
706 packagepath ) packagepath_user_defined=yes ;;
707 datadir ) lispdir_user_defined=yes etcdir_user_defined=yes ;; 707 datadir ) lispdir_user_defined=yes etcdir_user_defined=yes ;;
708 statedir | lockdir ) lockdir_user_defined=yes ;; 708 statedir | lockdir ) lockdir_user_defined=yes ;;
709 exec_prefix | libdir | archlibdir ) archlibdir_user_defined=yes ;; 709 exec_prefix | libdir | archlibdir ) archlibdir_user_defined=yes ;;
710 esac 710 esac
711 ;; 711 ;;
747 done 747 done
748 748
749 dnl ------------------------- 749 dnl -------------------------
750 dnl Finish options processing 750 dnl Finish options processing
751 dnl ------------------------- 751 dnl -------------------------
752
753 dnl Personal settings shouldn't affect the configuration process.
754 dnl if test "$infopath_user_defined" = "no" -a -n "$INFOPATH" ; then
755 dnl infopath="$INFOPATH"
756 dnl fi
757 752
758 dnl Get the arguments back. See the diatribe on Shell Magic above. 753 dnl Get the arguments back. See the diatribe on Shell Magic above.
759 eval set x "$quoted_arguments"; shift 754 eval set x "$quoted_arguments"; shift
760 755
761 dnl --extra-verbose implies --verbose 756 dnl --extra-verbose implies --verbose
1138 case "$canonical" in 1133 case "$canonical" in
1139 *-hp-hpux7* ) opsys=hpux ;; 1134 *-hp-hpux7* ) opsys=hpux ;;
1140 *-hp-hpux8* ) opsys=hpux8 ;; 1135 *-hp-hpux8* ) opsys=hpux8 ;;
1141 *-hp-hpux9* ) opsys=hpux9 ;; 1136 *-hp-hpux9* ) opsys=hpux9 ;;
1142 *-hp-hpux10* ) opsys=hpux10 ;; 1137 *-hp-hpux10* ) opsys=hpux10 ;;
1138 *-hp-hpux11* ) opsys=hpux11 ;;
1143 * ) opsys=hpux ;; 1139 * ) opsys=hpux ;;
1144 esac 1140 esac
1145 1141
1146 dnl HP has a broken "strcat" 1142 dnl HP has a broken "strcat"
1147 case "$opsys" in hpux9 | hpux10 ) XE_ADD_OBJS(strcat.o) ;; esac 1143 case "$opsys" in hpux9 | hpux10 ) XE_ADD_OBJS(strcat.o) ;; esac
1148 1144
1149 if test "$opsys" = "hpux10"; then ansi_flag="-Ae"; else ansi_flag="-Aa"; fi 1145 if test "$opsys" = "hpux10" -o "$opsys" = "hpux11"; then \
1146 ansi_flag="-Ae"; else ansi_flag="-Aa"; fi
1150 NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E" 1147 NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E"
1151 1148
1152 case "$canonical" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac 1149 case "$canonical" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac
1153 ;; 1150 ;;
1154 1151
3406 AC_SUBST(libdir) 3403 AC_SUBST(libdir)
3407 AC_SUBST(mandir) 3404 AC_SUBST(mandir)
3408 AC_SUBST(infodir) 3405 AC_SUBST(infodir)
3409 AC_SUBST(infodir_user_defined) 3406 AC_SUBST(infodir_user_defined)
3410 AC_SUBST(infopath) 3407 AC_SUBST(infopath)
3411 AC_SUBST(infopath_user_defined) 3408 AC_SUBST(package_path)
3412 AC_SUBST(packagepath) 3409 AC_SUBST(package_path_user_defined)
3413 AC_SUBST(packagepath_user_defined)
3414 AC_SUBST(lispdir) 3410 AC_SUBST(lispdir)
3415 AC_SUBST(lispdir_user_defined) 3411 AC_SUBST(lispdir_user_defined)
3416 AC_SUBST(sitelispdir) 3412 AC_SUBST(sitelispdir)
3417 AC_SUBST(sitelispdir_user_defined) 3413 AC_SUBST(sitelispdir_user_defined)
3418 AC_SUBST(etcdir) 3414 AC_SUBST(etcdir)