X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=configure;h=d6956042a55c6f75b2eca3979fb901656456aefb;hp=baa40614bdd39ced6fe817f13ed7dad916baf023;hb=af97f404faa7a7276ab61e97ca203cc373cc6014;hpb=7f2b16658ba330020aa8c505dbb3eca00c5afa9f

diff --git a/configure b/configure
index baa40614b..d6956042a 100755
--- a/configure
+++ b/configure
@@ -584,6 +584,8 @@ PACKAGE_URL=
 ac_unique_file="lisp/gnus.el"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+COMPRESS_INSTALL
+GZIP_PROG
 USE_FONTS
 WITHOUT_FONTS_bcr
 WITH_FONTS_bcr
@@ -593,10 +595,6 @@ WITHOUT_FONTS_bembo
 WITH_FONTS_bembo
 LATEX
 FLAGS
-W3
-HAVE_w3_forms
-URL
-HAVE_url
 info_dir
 etcdir
 lispdir
@@ -653,9 +651,8 @@ with_xemacs
 with_emacs
 with_lispdir
 with_etcdir
-with_url
-with_w3
 with_fonts
+with_compress_install
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1270,9 +1267,9 @@ Optional Packages:
   --with-emacs[=PROG]     use Emacs to build (default: PROG=emacs)
   --with-lispdir=DIR      Where to install lisp files
   --with-etcdir=DIR       Where to install etc files
-  --with-url=DIR          Specify where to find the url package
-  --with-w3=DIR           Specify where to find the w3 package
   --with-fonts            Assume all fonts required are available
+  --without-compress-install
+                          do not compress .el and .info files when installing.
 
 Report bugs to the package provider.
 _ACEOF
@@ -2095,208 +2092,6 @@ $as_echo "$info_dir" >&6; }
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acceptable URL version" >&5
-$as_echo_n "checking for acceptable URL version... " >&6; }
-if ${EMACS_cv_ACCEPTABLE_URL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for url-retrieve in url" >&5
-$as_echo_n "checking for url-retrieve in url... " >&6; }
-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\")))))"
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for url" >&5
-$as_echo_n "checking for url... " >&6; }
-fi
-if ${EMACS_cv_SYS_url+:} false; then :
-  $as_echo_n "(cached) " >&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
-	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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $url" >&5
-$as_echo "$url" >&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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_url" >&5
-$as_echo "$HAVE_url" >&6; }
-fi
-
-if test "${HAVE_url}" = "yes"; then
-	EMACS_cv_ACCEPTABLE_URL=yes
-else
-	EMACS_cv_ACCEPTABLE_URL=no
-fi
-
-if test "${EMACS_cv_ACCEPTABLE_URL}" = "yes"; then
-
-elisp="(file-name-directory (locate-library \"url\"))"
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for url_dir" >&5
-$as_echo_n "checking for url_dir... " >&6; }
-fi
-if ${EMACS_cv_SYS_url_dir+:} false; then :
-  $as_echo_n "(cached) " >&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
-	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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $url_dir" >&5
-$as_echo "$url_dir" >&6; }
-fi
-
-	EMACS_cv_ACCEPTABLE_URL=$EMACS_cv_SYS_url_dir
-fi
-
-fi
-
-
-# Check whether --with-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}
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${URL}\"" >&5
-$as_echo "\"${URL}\"" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acceptable W3 version" >&5
-$as_echo_n "checking for acceptable W3 version... " >&6; }
-if ${EMACS_cv_ACCEPTABLE_W3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for w3-form-encode-xwfu in w3_forms" >&5
-$as_echo_n "checking for w3-form-encode-xwfu in w3_forms... " >&6; }
-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\")))))"
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for w3_forms" >&5
-$as_echo_n "checking for w3_forms... " >&6; }
-fi
-if ${EMACS_cv_SYS_w3_forms+:} false; then :
-  $as_echo_n "(cached) " >&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
-	retval=`cat ${OUTPUT}`
-	echo "=> ${retval}" >& 5 2>&1
-	rm -f ${OUTPUT}
-	EMACS_cv_SYS_w3_forms=$retval
-
-fi
-
-w3_forms=${EMACS_cv_SYS_w3_forms}
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3_forms" >&5
-$as_echo "$w3_forms" >&6; }
-fi
-
-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
-	EMACS_cv_SYS_w3_forms=yes
-fi
-HAVE_w3_forms=${EMACS_cv_SYS_w3_forms}
-
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_w3_forms" >&5
-$as_echo "$HAVE_w3_forms" >&6; }
-fi
-
-if test "${HAVE_w3_forms}" = "yes"; then
-	EMACS_cv_ACCEPTABLE_W3=yes
-else
-	EMACS_cv_ACCEPTABLE_W3=no
-fi
-
-if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then
-
-elisp="(file-name-directory (locate-library \"w3-forms\"))"
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for w3_dir" >&5
-$as_echo_n "checking for w3_dir... " >&6; }
-fi
-if ${EMACS_cv_SYS_w3_dir+:} false; then :
-  $as_echo_n "(cached) " >&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
-	retval=`cat ${OUTPUT}`
-	echo "=> ${retval}" >& 5 2>&1
-	rm -f ${OUTPUT}
-	EMACS_cv_SYS_w3_dir=$retval
-
-fi
-
-w3_dir=${EMACS_cv_SYS_w3_dir}
-if test -z ""noecho""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3_dir" >&5
-$as_echo "$w3_dir" >&6; }
-fi
-
-	EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_dir
-fi
-
-fi
-
-
-# Check whether --with-w3 was given.
-if test "${with_w3+set}" = set; then :
-  withval=$with_w3;  EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null`
-fi
-
-   W3=${EMACS_cv_ACCEPTABLE_W3}
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${W3}\"" >&5
-$as_echo "\"${W3}\"" >&6; }
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which options to pass on to (X)Emacs" >&5
 $as_echo_n "checking which options to pass on to (X)Emacs... " >&6; }
   if test "x$FLAGS" = "x"; then
@@ -2449,6 +2244,68 @@ fi
 
 
 
+# Extract the first word of "gzip", so it can be a program name with args.
+set dummy gzip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GZIP_PROG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GZIP_PROG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GZIP_PROG="$GZIP_PROG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GZIP_PROG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GZIP_PROG=$ac_cv_path_GZIP_PROG
+if test -n "$GZIP_PROG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP_PROG" >&5
+$as_echo "$GZIP_PROG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+# Check whether --with-compress-install was given.
+if test "${with_compress_install+set}" = set; then :
+  withval=$with_compress_install;  if test "${withval}" = no; then
+		COMPRESS_INSTALL=no;
+	  else
+		if test -n "${GZIP_PROG}"; then
+			COMPRESS_INSTALL=yes;
+		else
+			COMPRESS_INSTALL=no;
+		fi;
+	  fi
+else
+   if test -n "${GZIP_PROG}"; then
+		COMPRESS_INSTALL=yes;
+	  else
+		COMPRESS_INSTALL=no;
+	  fi
+fi
+
+
+
 ac_config_files="$ac_config_files Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile"
 
 cat >confcache <<\_ACEOF