X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure;h=f96ef074bfed837f7d2f38bbf3f1bacabf777a2f;hb=0e7aa7b2cd5bc22cf738fd33efe417edc9f25e7f;hp=41263dc2951e05c6c5085e016b3c93c338a8c31f;hpb=505a1f90069307af68e21c07b4b6fec4ac037792;p=elisp%2Fgnus.git- diff --git a/configure b/configure index 41263dc..f96ef07 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.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -11,6 +11,17 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --with-emacs=EMACS compile with EMACS [EMACS=emacs, xemacs...]" +ac_help="$ac_help + --with-lispdir=DIR emacs lisp files go to DIR [guessed]" +ac_help="$ac_help + --with-addpath=PATH search Emacs-Lisp libraries with PATH + use colons to separate directory names" +ac_help="$ac_help + --with-xemacs=XEMACS compile with XEMACS [XEMACS=xemacs]" +ac_help="$ac_help + --with-packagedir=DIR package DIR for XEmacs [guessed]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -49,6 +60,7 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -332,7 +344,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -502,9 +514,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -519,7 +533,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:523: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:537: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -571,28 +585,30 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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:579: checking for a BSD compatible install" >&5 +echo "configure:594: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -622,15 +638,29 @@ 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_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= - # Extract the first word of "emacs xemacs", so it can be a program name with args. -set dummy emacs xemacs; ac_word=$2 + # Check whether --with-emacs or --without-emacs was given. +if test "${with_emacs+set}" = set; then + withval="$with_emacs" + case "${withval}" in + yes) EMACS= ;; + no) { echo "configure: error: emacs is not available" 1>&2; exit 1; } ;; + *) EMACS=${withval} ;; + esac +else + EMACS= +fi + + if test "x$EMACS" = "xt" -o "x$EMACS" = x; 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:634: checking for $ac_word" >&5 +echo "configure:664: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -638,9 +668,13 @@ else /*) ac_cv_path_EMACS="$EMACS" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_EMACS="$EMACS" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + 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_path_EMACS="$ac_dir/$ac_word" @@ -648,7 +682,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_EMACS" && ac_cv_path_EMACS="no" ;; esac fi @@ -659,34 +692,88 @@ else echo "$ac_t""no" 1>&6 fi - if test $EMACS != "no"; then - echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:665: checking where .elc files should go" >&5 - lispdir="\$(datadir)/emacs/site-lisp" +test -n "$EMACS" && break +done +test -n "$EMACS" || EMACS="no" + + if test $EMACS = no; then + { echo "configure: error: you should install Emacs first" 1>&2; exit 1; } + fi + fi + echo $ac_n "checking where emacs files are in""... $ac_c" 1>&6 +echo "configure:705: checking where emacs files are in" >&5 + EMACS_BASENAME="`echo x$EMACS | sed -e 's/x//' -e 's/^.*\///'`" + if test "x$emacsdir" = x; then if test "x$prefix" = "xNONE"; then - if test -d $ac_default_prefix/share/emacs/site-lisp; then - lispdir="\$(prefix)/share/emacs/site-lisp" - else - if test -d $ac_default_prefix/lib/emacs/site-lisp; then - lispdir="\$(prefix)/lib/emacs/site-lisp" - fi + prefix=$ac_default_prefix + fi + emacsdir="\$(datadir)/emacs" + case "$EMACS_BASENAME" in + emacs|emacs-*) + if test -d $prefix/lib/emacs; then + emacsdir="$prefix/lib/emacs" fi - else - if test -d $prefix/share/emacs/site-lisp; then - lispdir="\$(prefix)/share/emacs/site-lisp" - else - if test -d $prefix/lib/emacs/site-lisp; then - lispdir="\$(prefix)/lib/emacs/site-lisp" - fi + if test -d $prefix/share/emacs; then + emacsdir="$prefix/share/emacs" + fi + ;; + xemacs|xemacs-*) + if test -d $prefix/lib/xemacs; then + emacsdir="$prefix/lib/xemacs" + fi + if test -d $prefix/share/xemacs; then + emacsdir="$prefix/share/xemacs" fi + ;; + mule|mule-*) + if test -d $prefix/lib/emacs; then + emacsdir="$prefix/lib/emacs" + fi + if test -d $prefix/share/emacs; then + emacsdir="$prefix/share/emacs" + fi + if test -d $prefix/lib/mule; then + emacsdir="$prefix/lib/mule" + fi + if test -d $prefix/share/mule; then + emacsdir="$prefix/share/mule" + fi + ;; + esac + fi + echo "$ac_t""$emacsdir" 1>&6 + + # Check whether --with-lispdir or --without-lispdir was given. +if test "${with_lispdir+set}" = set; then + withval="$with_lispdir" + case "${withval}" in + yes) lispdir= ;; + no) { echo "configure: error: lispdir is not available" 1>&2; exit 1; } ;; + *) lispdir=${withval} ;; + esac +else + lispdir= +fi + + echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 +echo "configure:760: checking where .elc files should go" >&5 + if test "x$lispdir" = x; then + lispdir="$emacsdir/site-lisp" + if test -d $emacsdir/lisp; then + lispdir="$emacsdir/lisp" fi - echo "$ac_t""$lispdir" 1>&6 + case "$EMACS_BASENAME" in + xemacs|xemacs-*) + lispdir="$lispdir/tgnus" + ;; + esac fi + echo "$ac_t""$lispdir" 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:690: checking for $ac_word" >&5 +echo "configure:777: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -694,9 +781,13 @@ else /*) ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + 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_path_MAKEINFO="$ac_dir/$ac_word" @@ -715,6 +806,34 @@ else echo "$ac_t""no" 1>&6 fi + +ADDITIONAL_LOAD_PATH= +# Check whether --with-addpath or --without-addpath was given. +if test "${with_addpath+set}" = set; then + withval="$with_addpath" + ADDITIONAL_LOAD_PATH=$with_addpath +fi + + + +XEMACS="xemacs" +# Check whether --with-xemacs or --without-xemacs was given. +if test "${with_xemacs+set}" = set; then + withval="$with_xemacs" + XEMACS=$with_xemacs +fi + + + +PACKAGEDIR= +# Check whether --with-packagedir or --without-packagedir was given. +if test "${with_packagedir+set}" = set; then + withval="$with_packagedir" + PACKAGEDIR=$with_packagedir +fi + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -738,7 +857,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -817,7 +936,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.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -828,7 +947,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile lisp/Makefile texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -860,10 +981,15 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@SET_MAKE@%$SET_MAKE%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@EMACS@%$EMACS%g +s%@emacsdir@%$emacsdir%g s%@lispdir@%$lispdir%g s%@MAKEINFO@%$MAKEINFO%g +s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g +s%@XEMACS@%$XEMACS%g +s%@PACKAGEDIR@%$PACKAGEDIR%g CEOF EOF @@ -905,7 +1031,7 @@ EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then