X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure;h=ee8726d074e72c98a492546c02176bd98ea557b2;hb=c9cc1a3640f89569627ca16ea78faf663c35b75a;hp=519c2a746330dbf239e50603e5074a19e9ce3f66;hpb=4cae3582b834f8a847842b1cb82ef8acc40cc91f;p=elisp%2Fgnus.git-

diff --git a/configure b/configure
index 519c2a7..ee8726d 100755
--- a/configure
+++ b/configure
@@ -12,18 +12,19 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-xemacs           Use XEmacs to build [XEMACS=xemacs]"
+  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, mule...]"
 ac_help="$ac_help
-  --with-emacs            Use Emacs to build  [EMACS=emacs]"
+  --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-w3=DIR           Specify where to find the w3 package"
 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"
-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
@@ -534,8 +535,9 @@ else
 fi
 
 
+  GNUS_PRODUCT_NAME=t-gnus
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:539: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:541: 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
@@ -592,7 +594,7 @@ ac_configure="$SHELL $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:596: checking for a BSD compatible install" >&5
+echo "configure:598: 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
@@ -648,36 +650,10 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-
-XEMACS="xemacs"
-EMACS="emacs"
-# 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};
-	elif test "${withval}" != "no"; then
-		XEMACS=${withval};
-		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" && test "${withval}" != "no"; then
-		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:681: checking for $ac_word" >&5
+echo "configure:657: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -705,17 +681,202 @@ else
 fi
 
 
+      test x$EMACS = xt && EMACS=
+
+  # Check whether --with-emacs or --without-emacs was given.
+if test "${with_emacs+set}" = set; then
+  withval="$with_emacs"
+  if test x$withval = xyes -o x$withval = 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:696: 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:730: 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 x$withval = xyes -o x$withval = x; 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:767: 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:798: 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 x$EMACS = x &&\
+      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:835: 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"
+
+fi
 
   
-  echo $ac_n "checking if $EMACS is really XEmacs""... $ac_c" 1>&6
-echo "configure:712: 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:871: checking what a flavor does $EMACS have" >&5
+  
+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:717: checking for xemacsp" >&5
+	echo $ac_n "checking for flavor""... $ac_c" 1>&6
+echo "configure:878: checking for flavor" >&5
 fi
-if eval "test \"\${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
   
@@ -725,31 +886,32 @@ else
 	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
 
-  XEMACSP=${EMACS_cv_SYS_xemacsp}
-  EMACS_FLAVOR=emacs
-  if test "$XEMACSP" = "yes"; then
-     EMACS_FLAVOR=xemacs
-  fi
-  echo "$ac_t""$XEMACSP" 1>&6
-  
-
+  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:748: checking prefix for your Emacs" >&5
+echo "configure:910: 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:753: checking for prefix" >&5
+echo "configure:915: checking for prefix" >&5
 fi
 if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -779,29 +941,29 @@ 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:784: checking where .elc files should go" >&5
+  echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
+echo "configure:946: checking where lisp files should go" >&5
   if test -z "$lispdir"; then
         theprefix=$prefix
     if test "x$theprefix" = "xNONE"; then
 	theprefix=$ac_default_prefix
     fi
-    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
     for thedir in share lib; do
 	potential=
 	if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
-	   lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+	   lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
 	   break
 	fi
     done
   fi
-  echo "$ac_t""$lispdir" 1>&6
+  echo "$ac_t""$lispdir
+         (it will be ignored when \"make install-package[-ja]\" is done)" 1>&6
   
 
 
-
 echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:805: checking for acceptable W3 version" >&5
+echo "configure:967: checking for acceptable W3 version" >&5
 if eval "test \"\${EMACS_cv_ACCEPTABLE_W3+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -809,14 +971,14 @@ else
 
 if test -z ""noecho""; then
 	echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:813: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:975: 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:820: checking for w3_forms" >&5
+echo "configure:982: 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
@@ -860,7 +1022,7 @@ 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:864: checking for w3_dir" >&5
+echo "configure:1026: 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
@@ -881,7 +1043,7 @@ if test -z ""noecho""; then
 	echo "$ac_t""$w3_dir" 1>&6
 fi
 
-	EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_forms
+	EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_dir
 fi
 
 fi
@@ -896,25 +1058,34 @@ fi
    
    echo "$ac_t"""${W3}"" 1>&6
 
-
-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
-
-
-
-PACKAGEDIR=
-# Check whether --with-packagedir or --without-packagedir was given.
+  # Check whether --with-packagedir or --without-packagedir was given.
 if test "${with_packagedir+set}" = set; then
   withval="$with_packagedir"
-  PACKAGEDIR=${with_packagedir}
+  if test x$withval != xyes -a x$withval != x; then
+      echo $ac_n "checking where the package should go""... $ac_c" 1>&6
+echo "configure:1067: checking where the package should go" >&5
+      PACKAGEDIR=$withval
+      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 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:1081: 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
@@ -1064,15 +1235,14 @@ 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%@XEMACS@%$XEMACS%g
-s%@EMACS@%$EMACS%g
 s%@MAKEINFO@%$MAKEINFO%g
-s%@EMACS_FLAVOR@%$EMACS_FLAVOR%g
+s%@EMACS@%$EMACS%g
+s%@XEMACS@%$XEMACS%g
 s%@lispdir@%$lispdir%g
 s%@HAVE_w3_forms@%$HAVE_w3_forms%g
 s%@W3@%$W3%g
-s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
 s%@PACKAGEDIR@%$PACKAGEDIR%g
+s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
 
 CEOF
 EOF