X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure;h=5d7aaabec3e1cc94e6cd664e8d2a63f3691a2355;hb=e3980cdd5189dc6c06f14ace67676b2622bc5a02;hp=70069687103d2054ada28472049b7b000450e37f;hpb=21b78c5cf88ba55a2a842d21a8ec028cf652d9b3;p=elisp%2Fgnus.git-

diff --git a/configure b/configure
index 7006968..5d7aaab 100755
--- a/configure
+++ b/configure
@@ -12,16 +12,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...]"
+  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, mule...]"
 ac_help="$ac_help
-  --with-lispdir=DIR      emacs lisp files go to DIR [guessed]"
+  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]"
 ac_help="$ac_help
-  --with-addpath=PATH     search Emacs-Lisp libraries with PATH
-                          use colons to separate directory names"
+  --with-lispdir=DIR      Where to install lisp files
+                          (for XEmacs package, use --with-packagedir instead)"
 ac_help="$ac_help
-  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]"
+  --with-packagedir=DIR   package DIR for XEmacs"
 ac_help="$ac_help
-  --with-packagedir=DIR   package DIR for XEmacs [guessed]"
+  --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
@@ -532,8 +533,9 @@ else
 fi
 
 
+  GNUS_PRODUCT_NAME=t-gnus
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:537: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:539: 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
@@ -590,7 +592,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:594: checking for a BSD compatible install" >&5
+echo "configure:596: 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
@@ -646,50 +648,68 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-      # 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
+# 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:655: 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
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
 else
-  EMACS=
+  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_MAKEINFO="makeinfo"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_MAKEINFO" && ac_cv_prog_MAKEINFO="no"
 fi
+fi
+MAKEINFO="$ac_cv_prog_MAKEINFO"
+if test -n "$MAKEINFO"; then
+  echo "$ac_t""$MAKEINFO" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+      test x$EMACS = xt && EMACS=
 
-  if test "x$EMACS" = "xt" -o "x$EMACS" = x; then
-    for ac_prog in emacs xemacs mule
+  # 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:668: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_EMACS+set}\" = set"; then
+echo "configure:694: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$EMACS" in
-  /*)
-  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.
-  ;;
-  *)
+  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 
+  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"
+      ac_cv_prog_EMACS="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  ;;
-esac
 fi
-EMACS="$ac_cv_path_EMACS"
+fi
+EMACS="$ac_cv_prog_EMACS"
 if test -n "$EMACS"; then
   echo "$ac_t""$EMACS" 1>&6
 else
@@ -698,146 +718,218 @@ fi
 
 test -n "$EMACS" && break
 done
-test -n "$EMACS" || EMACS="no"
+test -n "$EMACS" || EMACS="emacs"
 
-    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:709: 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
-      prefix=$ac_default_prefix
+    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:728: 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
-    emacsdir="\$(datadir)/emacs"
-    case "$EMACS_BASENAME" in
-    emacs|emacs-*)
-      if test -d $prefix/lib/emacs; then
-	emacsdir="$prefix/lib/emacs"
-      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
+  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
-  lispdir=
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:764: 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
-    case "$EMACS_BASENAME" in
-    xemacs|xemacs-*)
-      lispdir="$lispdir/lookup"
-      ;;
-    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
+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:781: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_MAKEINFO+set}\" = set"; then
+echo "configure:765: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$MAKEINFO" in
-  /*)
-  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.
-  ;;
-  *)
+  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 
+  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"
+      ac_cv_prog_XEMACS="xemacs"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no"
-  ;;
-esac
+  test -z "$ac_cv_prog_XEMACS" && ac_cv_prog_XEMACS="xemacs"
 fi
-MAKEINFO="$ac_cv_path_MAKEINFO"
-if test -n "$MAKEINFO"; then
-  echo "$ac_t""$MAKEINFO" 1>&6
+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
 
-
-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
+    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:796: 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:833: 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"
 
-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
 
+  
+  
+  echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
+echo "configure:868: checking where lisp files should go" >&5
+  # Check whether --with-lispdir or --without-lispdir was given.
+if test "${with_lispdir+set}" = set; then
+  withval="$with_lispdir"
+  lispdir=$withval
+else
+  emacsdir=$datadir/emacs
+    test x$prefix = xNONE && prefix=$ac_default_prefix
+    case `echo x$EMACS | sed -e 's/x//' -e 's/^.*\///'` in
+    emacs|emacs-*)
+      if test -d $prefix/share/emacs; then
+        emacsdir=$prefix/share/emacs
+      elif test -d $prefix/lib/emacs; then
+        emacsdir=$prefix/lib/emacs
+      fi;;
+    xemacs|xemacs-*)
+      if test -d $prefix/lib/xemacs; then
+        emacsdir=$prefix/lib/xemacs
+      elif test -d $prefix/share/xemacs; then
+        emacsdir=$prefix/share/xemacs
+      fi;;
+    mule|mule-*)
+      if test -d $prefix/share/mule; then
+        emacsdir=$prefix/share/mule
+      elif test -d $prefix/lib/mule; then
+        emacsdir=$prefix/lib/mule
+      elif test -d $prefix/share/emacs; then
+        emacsdir=$prefix/share/emacs
+      elif test -d $prefix/lib/emacs; then
+        emacsdir=$prefix/lib/emacs
+      fi;;
+    esac
+    lispdir=$emacsdir/site-lisp/$GNUS_PRODUCT_NAME
+fi
 
-
-PACKAGEDIR=
-# Check whether --with-packagedir or --without-packagedir was given.
+  echo "$ac_t""$lispdir
+         (it will be ignored when \"make install-package[-ja]\" is done)" 1>&6
+  
+  # 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:911: 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:925: 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
@@ -987,13 +1079,12 @@ 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%@EMACS@%$EMACS%g
 s%@XEMACS@%$XEMACS%g
+s%@lispdir@%$lispdir%g
 s%@PACKAGEDIR@%$PACKAGEDIR%g
+s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
 
 CEOF
 EOF