X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure;h=92de619104538a08014f7bded46b1ef7c305b477;hb=d1d8788fd071e60bbc844bd34c2a9d7f216826b5;hp=3953a6bcce88a9d17a7c4f10cbf8467ef3525965;hpb=3738187cad20787b5b99c4061256e30e19ee721a;p=elisp%2Fgnus.git- diff --git a/configure b/configure index 3953a6b..92de619 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 +# Generated automatically using autoconf version 2.14.1 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -12,11 +12,12 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --with-xemacs Use XEmacs to build" + --with-emacs=EMACS compile with EMACS [EMACS=emacs, mule...]" ac_help="$ac_help - --with-emacs Use Emacs to build" + --with-xemacs=XEMACS compile with XEMACS [XEMACS=xemacs]" ac_help="$ac_help - --with-lispdir=DIR Where to install lisp files" + --with-lispdir=DIR Where to install lisp files + (for XEmacs package, use --with-packagedir instead)" ac_help="$ac_help --with-etcdir=DIR Where to install etc files" ac_help="$ac_help @@ -25,6 +26,11 @@ ac_help="$ac_help --with-w3=DIR Specify where to find the w3 package" ac_help="$ac_help --with-fonts Assume all fonts required are available" +ac_help="$ac_help + --with-packagedir=DIR package DIR for XEmacs" +ac_help="$ac_help + --with-addpath=PATH search Emacs-Lisp libraries with PATH + use colons to separate directory names" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -347,7 +353,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" + echo "configure generated by autoconf version 2.14.1" exit 0 ;; -with-* | --with-*) @@ -507,7 +513,7 @@ done if test -r "$cache_file"; then echo "loading cache $cache_file" - . $cache_file + test -f "$cache_file" && . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -535,10 +541,20 @@ else fi +echo $ac_n "defining gnus product name... $ac_c" + if eval "test \"\${EMACS_cv_GNUS_PRODUCT_NAME+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + EMACS_cv_GNUS_PRODUCT_NAME=t-gnus +fi + + GNUS_PRODUCT_NAME=${EMACS_cv_GNUS_PRODUCT_NAME} + echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6 + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:540: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:556: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftestmake <<\EOF @@ -577,9 +593,9 @@ done if test -z "$ac_aux_dir"; then { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -593,9 +609,9 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:597: checking for a BSD compatible install" >&5 +echo "configure:613: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then +if eval "test \"\${ac_cv_path_install+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -613,6 +629,10 @@ else grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -641,32 +661,15 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -if test "${EMACS}" = "t"; then - EMACS="" -fi - -# Check whether --with-xemacs or --without-xemacs was given. -if test "${with_xemacs+set}" = set; then - withval="$with_xemacs" - if test "${withval}" = "yes"; then EMACS=xemacs; else EMACS=${withval}; fi -fi - -# Check whether --with-emacs or --without-emacs was given. -if test "${with_emacs+set}" = set; then - withval="$with_emacs" - if test "${withval}" = "yes"; then EMACS=emacs; else EMACS=${withval}; fi -fi - # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:669: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then +echo "configure:672: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$MAKEINFO"; then @@ -693,11 +696,159 @@ else fi -# Extract the first word of "emacs", so it can be a program name with args. -set dummy emacs; ac_word=$2 + test "$EMACS" = t && EMACS= + + unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS; + + # Check whether --with-emacs or --without-emacs was given. +if test "${with_emacs+set}" = set; then + withval="$with_emacs" + if test "$withval" = yes -o -z "$withval"; then + for ac_prog in emacs xemacs mule +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:713: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$EMACS"; then + ac_cv_prog_EMACS="$EMACS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_EMACS="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +EMACS="$ac_cv_prog_EMACS" +if test -n "$EMACS"; then + echo "$ac_t""$EMACS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$EMACS" && break +done +test -n "$EMACS" || EMACS="emacs" + + else + # Extract the first word of "$withval", so it can be a program name with args. +set dummy $withval; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:747: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$EMACS"; then + ac_cv_prog_EMACS="$EMACS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_EMACS="$withval" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_EMACS" && ac_cv_prog_EMACS="emacs" +fi +fi +EMACS="$ac_cv_prog_EMACS" +if test -n "$EMACS"; then + echo "$ac_t""$EMACS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi +fi + + # Check whether --with-xemacs or --without-xemacs was given. +if test "${with_xemacs+set}" = set; then + withval="$with_xemacs" + if test "$withval" = yes -o -z "$withval"; then + # Extract the first word of "xemacs", so it can be a program name with args. +set dummy xemacs; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:784: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$XEMACS"; then + ac_cv_prog_XEMACS="$XEMACS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_XEMACS="xemacs" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_XEMACS" && ac_cv_prog_XEMACS="xemacs" +fi +fi +XEMACS="$ac_cv_prog_XEMACS" +if test -n "$XEMACS"; then + echo "$ac_t""$XEMACS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + else + # Extract the first word of "$withval", so it can be a program name with args. +set dummy $withval; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:815: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$XEMACS"; then + ac_cv_prog_XEMACS="$XEMACS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_XEMACS="$withval" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_XEMACS" && ac_cv_prog_XEMACS="xemacs" +fi +fi +XEMACS="$ac_cv_prog_XEMACS" +if test -n "$XEMACS"; then + echo "$ac_t""$XEMACS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + EMACS=$XEMACS +else + XEMACS=xemacs + test -z "$EMACS" && for ac_prog in emacs xemacs mule +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:700: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_EMACS'+set}'`\" = set"; then +echo "configure:851: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$EMACS"; then @@ -708,12 +859,11 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_EMACS="emacs" + ac_cv_prog_EMACS="$ac_prog" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_EMACS" && ac_cv_prog_EMACS="xemacs" fi fi EMACS="$ac_cv_prog_EMACS" @@ -723,61 +873,72 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$EMACS" && break +done +test -n "$EMACS" || EMACS="emacs" +fi - echo $ac_n "checking if $EMACS is really XEmacs""... $ac_c" 1>&6 -echo "configure:731: checking if $EMACS is really XEmacs" >&5 -elisp="(if (string-match \"XEmacs\" emacs-version) \"yes\" \"no\") " + + echo $ac_n "checking what a flavor does $EMACS have""... $ac_c" 1>&6 +echo "configure:887: checking what a flavor does $EMACS have" >&5 + + unset EMACS_cv_SYS_flavor; + + +elisp="(cond ((featurep (quote xemacs)) \"XEmacs\")\ + ((boundp (quote MULE)) \"MULE\")\ + (t \"FSF Emacs\"))" if test -z ""noecho""; then - echo $ac_n "checking for xemacsp""... $ac_c" 1>&6 -echo "configure:736: checking for xemacsp" >&5 + echo $ac_n "checking for flavor""... $ac_c" 1>&6 +echo "configure:897: checking for flavor" >&5 fi -if eval "test \"`echo '$''{'EMACS_cv_SYS_xemacsp'+set}'`\" = set"; then +if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else OUTPUT=./conftest-$$ - echo ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" >& 5 2>&1 - ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1 + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 retval=`cat ${OUTPUT}` echo "=> ${retval}" >& 5 2>&1 rm -f ${OUTPUT} - EMACS_cv_SYS_xemacsp=$retval + EMACS_cv_SYS_flavor=$retval fi -xemacsp=${EMACS_cv_SYS_xemacsp} +flavor=${EMACS_cv_SYS_flavor} if test -z ""noecho""; then - echo "$ac_t""$xemacsp" 1>&6 + echo "$ac_t""$flavor" 1>&6 fi - XEMACS=${EMACS_cv_SYS_xemacsp} - EMACS_FLAVOR=emacs - if test "$XEMACS" = "yes"; then - EMACS_FLAVOR=xemacs - fi - echo "$ac_t""$XEMACS" 1>&6 - - - - if test "$prefix" = "NONE"; then + case $EMACS_cv_SYS_flavor in + XEmacs) + EMACS_FLAVOR=xemacs;; + MULE) + EMACS_FLAVOR=mule;; + *) + EMACS_FLAVOR=emacs;; + esac + echo "$ac_t""$EMACS_cv_SYS_flavor" 1>&6 + if test "$prefix" = NONE; then echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6 -echo "configure:768: checking prefix for your Emacs" >&5 +echo "configure:929: checking prefix for your Emacs" >&5 elisp="(expand-file-name \"..\" invocation-directory)" if test -z ""noecho""; then echo $ac_n "checking for prefix""... $ac_c" 1>&6 -echo "configure:773: checking for prefix" >&5 +echo "configure:934: checking for prefix" >&5 fi -if eval "test \"`echo '$''{'EMACS_cv_SYS_prefix'+set}'`\" = set"; then +if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else OUTPUT=./conftest-$$ - echo ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" >& 5 2>&1 - ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1 + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 retval=`cat ${OUTPUT}` echo "=> ${retval}" >& 5 2>&1 rm -f ${OUTPUT} @@ -799,23 +960,36 @@ if test "${with_lispdir+set}" = set; then lispdir=${withval} fi - echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:804: checking where .elc files should go" >&5 + echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6 +echo "configure:965: checking where lisp files should go" >&5 if test -z "$lispdir"; then theprefix=$prefix - if test "x$theprefix" = "xNONE"; then + if test "$theprefix" = NONE; then theprefix=$ac_default_prefix fi - lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp" + if test "$EMACS_FLAVOR" = "xemacs"; then + lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/${GNUS_PRODUCT_NAME}" + else + lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}" + fi for thedir in share lib; do potential= if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then - lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp" + if test "$EMACS_FLAVOR" = "xemacs"; then + lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/${GNUS_PRODUCT_NAME}" + else + lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}" + fi break fi done fi - echo "$ac_t""$lispdir" 1>&6 + if test ${EMACS_FLAVOR} = xemacs; then + echo "$ac_t""$lispdir + (it will be ignored when \"make install-package[-ja]\" is done)" 1>&6 + else + echo "$ac_t""$lispdir" 1>&6 + fi @@ -826,39 +1000,63 @@ if test "${with_etcdir+set}" = set; then fi echo $ac_n "checking where etc files should go""... $ac_c" 1>&6 -echo "configure:830: checking where etc files should go" >&5 +echo "configure:1004: checking where etc files should go" >&5 if test -z "$etcdir"; then - etcdir="\$(lispdir)/../etc" + if test "$EMACS_FLAVOR" = "xemacs"; then + etcdir="\$(lispdir)/../../etc" + else + etcdir="\$(lispdir)/../etc" + fi fi echo "$ac_t""$etcdir" 1>&6 + echo $ac_n "checking where the TeXinfo docs should go""... $ac_c" 1>&6 +echo "configure:1017: checking where the TeXinfo docs should go" >&5 + if test "$infodir" = "\${prefix}/info"; then + if test "$EMACS_FLAVOR" = "xemacs"; then + info_dir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/info" + else + info_dir="\$(prefix)/info" + fi + else + info_dir=$infodir + fi + echo "$ac_t""$info_dir" 1>&6 + + + echo $ac_n "checking for acceptable URL version""... $ac_c" 1>&6 -echo "configure:839: checking for acceptable URL version" >&5 -if eval "test \"`echo '$''{'EMACS_cv_ACCEPTABLE_URL'+set}'`\" = set"; then +echo "configure:1032: checking for acceptable URL version" >&5 + +unset EMACS_cv_ACCEPTABLE_URL; +unset EMACS_cv_SYS_url_dir; +unset EMACS_cv_SYS_url; + +if eval "test \"\${EMACS_cv_ACCEPTABLE_URL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z ""noecho""; then echo $ac_n "checking for url-retrieve in url""... $ac_c" 1>&6 -echo "configure:847: checking for url-retrieve in url" >&5 +echo "configure:1045: checking for url-retrieve in url" >&5 fi library=`echo url | tr _ -` -elisp="(progn (fmakunbound 'url-retrieve) (condition-case nil (progn (require '$library) (fboundp 'url-retrieve)) (error (prog1 nil (message \"$library not found\")))))" +elisp="(progn (fmakunbound (quote url-retrieve)) (condition-case nil (progn (require (quote $library)) (fboundp (quote url-retrieve))) (error (prog1 nil (message \"$library not found\")))))" if test -z ""noecho""; then echo $ac_n "checking for url""... $ac_c" 1>&6 -echo "configure:854: checking for url" >&5 +echo "configure:1052: checking for url" >&5 fi -if eval "test \"`echo '$''{'EMACS_cv_SYS_url'+set}'`\" = set"; then +if eval "test \"\${EMACS_cv_SYS_url+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else OUTPUT=./conftest-$$ - echo ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" >& 5 2>&1 - ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1 + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 retval=`cat ${OUTPUT}` echo "=> ${retval}" >& 5 2>&1 rm -f ${OUTPUT} @@ -871,10 +1069,10 @@ if test -z ""noecho""; then echo "$ac_t""$url" 1>&6 fi -if test "${EMACS_cv_SYS_url}" = "nil"; then +if test "${EMACS_cv_SYS_url}" = nil; then EMACS_cv_SYS_url=no fi -if test "${EMACS_cv_SYS_url}" = "t"; then +if test "${EMACS_cv_SYS_url}" = t; then EMACS_cv_SYS_url=yes fi HAVE_url=${EMACS_cv_SYS_url} @@ -883,26 +1081,26 @@ if test -z ""noecho""; then echo "$ac_t""$HAVE_url" 1>&6 fi -if test "${HAVE_url}" = "yes"; then +if test "${HAVE_url}" = yes; then EMACS_cv_ACCEPTABLE_URL=yes else - EMACS_cv_ACCEPTABLE_URL=no + EMACS_cv_ACCEPTABLE_URL= fi -if test "${EMACS_cv_ACCEPTABLE_URL}" = "yes"; then +if test "${EMACS_cv_ACCEPTABLE_URL}" = yes; then elisp="(file-name-directory (locate-library \"url\"))" if test -z ""noecho""; then echo $ac_n "checking for url_dir""... $ac_c" 1>&6 -echo "configure:898: checking for url_dir" >&5 +echo "configure:1096: checking for url_dir" >&5 fi -if eval "test \"`echo '$''{'EMACS_cv_SYS_url_dir'+set}'`\" = set"; then +if eval "test \"\${EMACS_cv_SYS_url_dir+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else OUTPUT=./conftest-$$ - echo ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" >& 5 2>&1 - ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1 + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 retval=`cat ${OUTPUT}` echo "=> ${retval}" >& 5 2>&1 rm -f ${OUTPUT} @@ -928,34 +1126,43 @@ fi URL=${EMACS_cv_ACCEPTABLE_URL} - echo "$ac_t"""${URL}"" 1>&6 + if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then + echo "$ac_t""not found" 1>&6 + else + echo "$ac_t"""${URL}"" 1>&6 + fi echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6 -echo "configure:936: checking for acceptable W3 version" >&5 -if eval "test \"`echo '$''{'EMACS_cv_ACCEPTABLE_W3'+set}'`\" = set"; then +echo "configure:1138: checking for acceptable W3 version" >&5 + +unset EMACS_cv_ACCEPTABLE_W3; +unset EMACS_cv_SYS_w3_dir; +unset EMACS_cv_SYS_w3_forms; + +if eval "test \"\${EMACS_cv_ACCEPTABLE_W3+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z ""noecho""; then echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6 -echo "configure:944: checking for w3-form-encode-xwfu in w3_forms" >&5 +echo "configure:1151: checking for w3-form-encode-xwfu in w3_forms" >&5 fi library=`echo w3_forms | tr _ -` -elisp="(progn (fmakunbound 'w3-form-encode-xwfu) (condition-case nil (progn (require '$library) (fboundp 'w3-form-encode-xwfu)) (error (prog1 nil (message \"$library not found\")))))" +elisp="(progn (fmakunbound (quote w3-form-encode-xwfu)) (condition-case nil (progn (require (quote $library)) (fboundp (quote w3-form-encode-xwfu))) (error (prog1 nil (message \"$library not found\")))))" if test -z ""noecho""; then echo $ac_n "checking for w3_forms""... $ac_c" 1>&6 -echo "configure:951: checking for w3_forms" >&5 +echo "configure:1158: checking for w3_forms" >&5 fi -if eval "test \"`echo '$''{'EMACS_cv_SYS_w3_forms'+set}'`\" = set"; then +if eval "test \"\${EMACS_cv_SYS_w3_forms+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else OUTPUT=./conftest-$$ - echo ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" >& 5 2>&1 - ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1 + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 retval=`cat ${OUTPUT}` echo "=> ${retval}" >& 5 2>&1 rm -f ${OUTPUT} @@ -968,10 +1175,10 @@ if test -z ""noecho""; then echo "$ac_t""$w3_forms" 1>&6 fi -if test "${EMACS_cv_SYS_w3_forms}" = "nil"; then +if test "${EMACS_cv_SYS_w3_forms}" = nil; then EMACS_cv_SYS_w3_forms=no fi -if test "${EMACS_cv_SYS_w3_forms}" = "t"; then +if test "${EMACS_cv_SYS_w3_forms}" = t; then EMACS_cv_SYS_w3_forms=yes fi HAVE_w3_forms=${EMACS_cv_SYS_w3_forms} @@ -980,26 +1187,26 @@ if test -z ""noecho""; then echo "$ac_t""$HAVE_w3_forms" 1>&6 fi -if test "${HAVE_w3_forms}" = "yes"; then +if test "${HAVE_w3_forms}" = yes; then EMACS_cv_ACCEPTABLE_W3=yes else - EMACS_cv_ACCEPTABLE_W3=no + EMACS_cv_ACCEPTABLE_W3= fi -if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then +if test "${EMACS_cv_ACCEPTABLE_W3}" = yes; then elisp="(file-name-directory (locate-library \"w3-forms\"))" if test -z ""noecho""; then echo $ac_n "checking for w3_dir""... $ac_c" 1>&6 -echo "configure:995: checking for w3_dir" >&5 +echo "configure:1202: checking for w3_dir" >&5 fi -if eval "test \"`echo '$''{'EMACS_cv_SYS_w3_dir'+set}'`\" = set"; then +if eval "test \"\${EMACS_cv_SYS_w3_dir+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else OUTPUT=./conftest-$$ - echo ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" >& 5 2>&1 - ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1 + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 retval=`cat ${OUTPUT}` echo "=> ${retval}" >& 5 2>&1 rm -f ${OUTPUT} @@ -1025,7 +1232,11 @@ fi W3=${EMACS_cv_ACCEPTABLE_W3} - echo "$ac_t"""${W3}"" 1>&6 + if test -z "${EMACS_cv_ACCEPTABLE_W3}"; then + echo "$ac_t""not found" 1>&6 + else + echo "$ac_t""${W3}" 1>&6 + fi test "$LATEX" = t && LATEX= @@ -1034,8 +1245,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1038: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then +echo "configure:1249: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_path_LATEX+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$LATEX" in @@ -1071,7 +1282,7 @@ done test -n "$LATEX" || LATEX="no" echo $ac_n "checking for available fonts""... $ac_c" 1>&6 -echo "configure:1075: checking for available fonts" >&5 +echo "configure:1286: checking for available fonts" >&5 # Check whether --with-fonts or --without-fonts was given. if test "${with_fonts+set}" = set; then withval="$with_fonts" @@ -1104,13 +1315,13 @@ if test -z "${USE_FONTS}"; then if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1 ; then : else - if test -z "${USE_FONTS}"; then + if test -z "${USE_FONTS}"; then USE_FONTS="Adobe Futura" - else + else USE_FONTS="${USE_FONTS}, Adobe Futura" - fi - WITH_FONTS_pfu= - WITHOUT_FONTS_pfu='%' + fi + WITH_FONTS_pfu= + WITHOUT_FONTS_pfu='%' fi fi echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT} @@ -1118,13 +1329,13 @@ if test -z "${USE_FONTS}"; then if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1 ; then : else - if test -z "${USE_FONTS}"; then + if test -z "${USE_FONTS}"; then USE_FONTS="Bitstream Courier" - else + else USE_FONTS="${USE_FONTS}, Bitstream Courier" - fi - WITH_FONTS_bcr= - WITHOUT_FONTS_bcr='%' + fi + WITH_FONTS_bcr= + WITHOUT_FONTS_bcr='%' fi fi rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi @@ -1157,7 +1368,116 @@ else fi + if test ${EMACS_FLAVOR} = xemacs; then + echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6 +echo "configure:1374: checking where the XEmacs package is" >&5 + # Check whether --with-packagedir or --without-packagedir was given. +if test "${with_packagedir+set}" = set; then + withval="$with_packagedir" + if test "$withval" != yes -a -n "$withval"; then + PACKAGEDIR=$withval + else + +elisp="(let (package-dir)\ + (if (boundp (quote early-packages))\ + (let ((dirs (delq nil (append (if early-package-load-path\ + early-packages)\ + (if late-package-load-path\ + late-packages)\ + (if last-package-load-path\ + last-packages)))))\ + (while (and dirs (not package-dir))\ + (if (file-directory-p (car dirs))\ + (setq package-dir (car dirs)\ + dirs (cdr dirs))))))\ + (or package-dir \"\"))" +if test -z ""noecho""; then + echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6 +echo "configure:1397: checking for PACKAGEDIR" >&5 +fi +if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + OUTPUT=./conftest-$$ + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + retval=`cat ${OUTPUT}` + echo "=> ${retval}" >& 5 2>&1 + rm -f ${OUTPUT} + EMACS_cv_SYS_PACKAGEDIR=$retval + +fi + +PACKAGEDIR=${EMACS_cv_SYS_PACKAGEDIR} +if test -z ""noecho""; then + echo "$ac_t""$PACKAGEDIR" 1>&6 +fi + + fi +else + +elisp="(let (package-dir)\ + (if (boundp (quote early-packages))\ + (let ((dirs (delq nil (append (if early-package-load-path\ + early-packages)\ + (if late-package-load-path\ + late-packages)\ + (if last-package-load-path\ + last-packages)))))\ + (while (and dirs (not package-dir))\ + (if (file-directory-p (car dirs))\ + (setq package-dir (car dirs)\ + dirs (cdr dirs))))))\ + (or package-dir \"\"))" +if test -z ""noecho""; then + echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6 +echo "configure:1436: checking for PACKAGEDIR" >&5 +fi +if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + OUTPUT=./conftest-$$ + echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1 + retval=`cat ${OUTPUT}` + echo "=> ${retval}" >& 5 2>&1 + rm -f ${OUTPUT} + EMACS_cv_SYS_PACKAGEDIR=$retval + +fi + +PACKAGEDIR=${EMACS_cv_SYS_PACKAGEDIR} +if test -z ""noecho""; then + echo "$ac_t""$PACKAGEDIR" 1>&6 +fi +fi + + if test -z "$PACKAGEDIR"; then + echo "$ac_t""not found" 1>&6 + else + echo "$ac_t""$PACKAGEDIR" 1>&6 + fi + else + PACKAGEDIR= + fi + + # Check whether --with-addpath or --without-addpath was given. +if test "${with_addpath+set}" = set; then + withval="$with_addpath" + if test "$withval" != yes -a -n "$withval"; then + echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6 +echo "configure:1473: checking where to find the additional elisp libraries" >&5 + ADDITIONAL_LOAD_PATH=$withval + echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6 + fi +else + ADDITIONAL_LOAD_PATH= +fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1225,7 +1545,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%#define \([^ ][^ ]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g @@ -1260,7 +1580,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" + echo "$CONFIG_STATUS generated by autoconf version 2.14.1" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1271,7 +1591,8 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile etc/Makefile lisp/Makefile texi/Makefile \ + texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then