--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
+ --with-url=DIR Specify where to find the url package"
+ac_help="$ac_help
--with-w3=DIR Specify where to find the w3 package"
ac_help="$ac_help
--with-packagedir=DIR package DIR for XEmacs"
echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:550: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:554: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# 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:607: checking for a BSD compatible install" >&5
+echo "configure:611: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"\${ac_cv_path_install+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# 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:666: checking for $ac_word" >&5
+echo "configure:670: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# 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:707: checking for $ac_word" >&5
+echo "configure:711: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
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:741: checking for $ac_word" >&5
+echo "configure:745: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# 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:778: checking for $ac_word" >&5
+echo "configure:782: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
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:809: checking for $ac_word" >&5
+echo "configure:813: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# 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:846: checking for $ac_word" >&5
+echo "configure:850: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking what a flavor does $EMACS have""... $ac_c" 1>&6
-echo "configure:882: checking what a flavor does $EMACS have" >&5
+echo "configure:886: checking what a flavor does $EMACS have" >&5
unset EMACS_cv_SYS_flavor;
(t \"FSF Emacs\"))"
if test -z ""noecho""; then
echo $ac_n "checking for flavor""... $ac_c" 1>&6
-echo "configure:892: checking for flavor" >&5
+echo "configure:896: checking for flavor" >&5
fi
if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
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:924: checking prefix for your Emacs" >&5
+echo "configure:928: 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:929: checking for prefix" >&5
+echo "configure:933: checking for prefix" >&5
fi
if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
fi
echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
-echo "configure:960: checking where lisp files should go" >&5
+echo "configure:964: checking where lisp files should go" >&5
if test -z "$lispdir"; then
theprefix=$prefix
if test "x$theprefix" = "xNONE"; then
+ # Check whether --with-etcdir or --without-etcdir was given.
+if test "${with_etcdir+set}" = set; then
+ withval="$with_etcdir"
+ etcdir=${withval}
+fi
+
+ echo $ac_n "checking where etc files should go""... $ac_c" 1>&6
+echo "configure:995: checking where etc files should go" >&5
+ if test -z "$etcdir"; then
+ etcdir="\$(lispdir)/../etc"
+ fi
+ echo "$ac_t""$etcdir" 1>&6
+
+
+
+echo $ac_n "checking for acceptable URL version""... $ac_c" 1>&6
+echo "configure:1004: 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:1017: checking for url-retrieve in url" >&5
+fi
+library=`echo url | tr _ -`
+
+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:1024: checking for url" >&5
+fi
+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}'" 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_url=$retval
+
+fi
+
+url=${EMACS_cv_SYS_url}
+if test -z ""noecho""; then
+ echo "$ac_t""$url" 1>&6
+fi
+
+if test "${EMACS_cv_SYS_url}" = "nil"; then
+ EMACS_cv_SYS_url=no
+fi
+if test "${EMACS_cv_SYS_url}" = "t"; then
+ EMACS_cv_SYS_url=yes
+fi
+HAVE_url=${EMACS_cv_SYS_url}
+
+if test -z ""noecho""; then
+ echo "$ac_t""$HAVE_url" 1>&6
+fi
+
+if test "${HAVE_url}" = "yes"; then
+ EMACS_cv_ACCEPTABLE_URL=yes
+else
+ EMACS_cv_ACCEPTABLE_URL=
+fi
+
+if test "x${EMACS_cv_ACCEPTABLE_URL}" = "xyes"; 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:1068: checking for url_dir" >&5
+fi
+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}'" 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_url_dir=$retval
+
+fi
+
+url_dir=${EMACS_cv_SYS_url_dir}
+if test -z ""noecho""; then
+ echo "$ac_t""$url_dir" 1>&6
+fi
+
+ EMACS_cv_ACCEPTABLE_URL=$EMACS_cv_SYS_url_dir
+fi
+
+fi
+
+ # Check whether --with-url or --without-url was given.
+if test "${with_url+set}" = set; then
+ withval="$with_url"
+ EMACS_cv_ACCEPTABLE_URL=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null`
+fi
+
+ URL=${EMACS_cv_ACCEPTABLE_URL}
+
+ if test "x${EMACS_cv_ACCEPTABLE_URL}" = "x"; 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:985: checking for acceptable W3 version" >&5
+echo "configure:1110: checking for acceptable W3 version" >&5
unset EMACS_cv_ACCEPTABLE_W3;
unset EMACS_cv_SYS_w3_dir;
if test -z ""noecho""; then
echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:998: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:1123: checking for w3-form-encode-xwfu in w3_forms" >&5
fi
library=`echo w3_forms | tr _ -`
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:1005: checking for w3_forms" >&5
+echo "configure:1130: checking for w3_forms" >&5
fi
if eval "test \"\${EMACS_cv_SYS_w3_forms+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
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:1049: checking for w3_dir" >&5
+echo "configure:1174: checking for w3_dir" >&5
fi
if eval "test \"\${EMACS_cv_SYS_w3_dir+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
if test ${EMACS_FLAVOR} = xemacs; then
echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6
-echo "configure:1091: checking where the XEmacs package is" >&5
+echo "configure:1216: 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"
(or package-dir \"\"))"
if test -z ""noecho""; then
echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1114: checking for PACKAGEDIR" >&5
+echo "configure:1239: checking for PACKAGEDIR" >&5
fi
if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
(or package-dir \"\"))"
if test -z ""noecho""; then
echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1153: checking for PACKAGEDIR" >&5
+echo "configure:1278: checking for PACKAGEDIR" >&5
fi
if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
withval="$with_addpath"
if test x$withval != xyes -a x$withval != x; then
echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
-echo "configure:1190: checking where to find the additional elisp libraries" >&5
+echo "configure:1315: checking where to find the additional elisp libraries" >&5
ADDITIONAL_LOAD_PATH=$withval
echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6
fi
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile etc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@EMACS@%$EMACS%g
s%@XEMACS@%$XEMACS%g
s%@lispdir@%$lispdir%g
+s%@etcdir@%$etcdir%g
+s%@HAVE_url@%$HAVE_url%g
+s%@URL@%$URL%g
s%@HAVE_w3_forms@%$HAVE_w3_forms%g
s%@W3@%$W3%g
s%@PACKAGEDIR@%$PACKAGEDIR%g
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile etc/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
projects / elisp / gnus.git- / blobdiff