xemacs-beta: configure.in comparison

comparison configure.in @ 203:850242ba4a81 r20-3b28

Import from CVS: tag r20-3b28

author	cvs
date	Mon, 13 Aug 2007 10:02:21 +0200
parents	eb5470882647
children	e45d5e7c476e

comparison

equal deleted inserted replaced

-:61eefc8fc970
+:850242ba4a81
 target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
 CDPATH=.; export CDPATH
-dnl this will serve for testing if a default value sould be given
+dnl this will serve for testing if a default value should be given
 package_path=NONE
 dnl Allow this script to work with zsh, by setting sh emulation options
 if test -n "$ZSH_VERSION"; then
 setopt NO_BAD_PATTERN NO_BANG_HIST NO_BG_NICE NO_EQUALS NO_FUNCTION_ARGZERO
 statedir='${prefix}/lib'
 libdir='${exec_prefix}/lib'
 mandir='${prefix}/man/man1'
 infodir='${prefix}/lib/xemacs-${version}/info'
 infodir_user_defined='no'
+dnl BETA NOTE: ! Will you please add to this list?  Nonexistent dirs
+dnl are dropped from the list at runtime, so it is safe to add
+dnl directories to this list that you don't have at home.
+infopath='/usr/info:/usr/local/info:/usr/lib/texmf/doc/info:/usr/local/lib/texmf/doc/info'
+infopath_user_defined='no'
 lispdir='${datadir}/xemacs-${version}/lisp'
 lispdir_user_defined='no'
 sitelispdir='${datadir}/xemacs/site-lisp'
 etcdir='${datadir}/xemacs-${version}/etc'
 etcdir_user_defined='no'
 --mail-locking=TYPE (*)	Specify the locking to be used by movemail to prevent
 			concurrent updates of mail spool files. Valid types
 			are \`lockf', \`flock', and \`file'.
 --package-path=PATH     Directories to search for packages to dump with xemacs.
 Defaults to \`$prefix/lib/xemacs/packages:~/.xemacs'.
+--infodir=dir		Directory to install the XEmacs Info manuals and dir in.
+Defaults to: \`$info_dir'.
+--infopath=PATH		Directories to search for Info documents, info dir
+			and localdir files.  This is used to initialize
+			\`Info-default-directory-list' at dump time.
+			Directories on this path that do not exist in the
+			filesystem will be dropped by the startup code at
+			runtime, so it is safe to specify directories that do
+			not exist in the compilation environment, or that won't
+			exist in the runtime environment. The \"dir\"
+			file in the first existing directory in this list will
+			become the (dir)Top node of the Info tree.
+Defaults to the value of \`INFOPATH', or:
+\`$infopath'.
 Internationalization options:
 --with-mule		Compile with Mule (MUlti-Lingual Emacs) support,
 			needed to suport non-Latin-1 (including Asian) languages.
 --puresize=VALUE	Override default amount of space for pure Lisp code.
 --rel-alloc		Use the relocating allocator (default for this option
 			is system-dependent).
 --with-clash-detection	Use lock files to detect multiple edits of the same file.
 			The default is to not do clash detection.
+--lockdir=dir		The directory to put clash detection files in, such as
+			\`/var/lock/emacs'.
+Defaults to \`$lockdir'.
 --with-system-malloc	Force use of the system malloc, rather than GNU malloc.
 --with-debug-malloc	Use the debugging malloc package.
 You may also specify any of the \`path' variables found in
 Makefile.in, including --bindir, --libdir, --lispdir, --datadir, and
 CPP       C preprocessor to use (such as /usr/ccs/lib/cpp or cc -E)
 CFLAGS    C compiler compilation flags (such as -O)
 CPPFLAGS  Additional compilation flags (such as -I/foo) used only by the preprocessor
 LDFLAGS   Additional linker flags (such as -L/foo)
 LIBS      Additional libraries (such as -lfoo)
+INFOPATH  Path to search for Info documentation.
 For more details on the install process, consult the INSTALL file.
 "
 dnl ------------------
 	dnl testers, at large sites, have said they have their X files
 	dnl installed in odd places.
 	dnl Has the user specified one of the path options?
 	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
-	mandir | infodir | lispdir | etcdir | lockdir | pkgdir | archlibdir | \
+	mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \
-	sitelispdir | docdir )
+	 archlibdir | sitelispdir | docdir )
 	   dnl If the value was omitted, get it from the next argument.
 	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 		 USAGE_ERROR("The \`--$optname' option requires a value.");
 	     fi
 dnl default value of lockdir.
 case "$opt" in
 lispdir ) lispdir_user_defined=yes ;;
 etcdir  )  etcdir_user_defined=yes ;;
 infodir ) infodir_user_defined=yes ;;
+infopath ) infopath_user_defined=yes ;;
 datadir ) lispdir_user_defined=yes etcdir_user_defined=yes ;;
 statedir | lockdir ) lockdir_user_defined=yes ;;
 exec_prefix | libdir | archlibdir ) archlibdir_user_defined=yes ;;
 esac
 	;;
 done
 dnl -------------------------
 dnl Finish options processing
 dnl -------------------------
+if test "$infopath_user_defined" = "no" -a -n "$INFOPATH" ; then
+infopath="$INFOPATH"
+fi
 dnl Get the arguments back.  See the diatribe on Shell Magic above.
 eval set x "$quoted_arguments"; shift
 dnl Argument interdependencies
 if test -z "$CFLAGS"; then
 dnl Following values of CFLAGS are known to work well.
 dnl Should we take debugging options into consideration?
 if   test "$GCC" = "yes"; then
 CFLAGS="-g -O2 -Wall -Wno-switch"
-test "$opsys" = "linux" -a "$machine" = "intel386" && \
+test "$opsys $machine" = "linux intel386" && \
 CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
 elif test "$__sunpro_c" = "yes"; then
 case "$opsys" in
 sol2    ) CFLAGS="-v -xO4" ;;
 sunos4* ) CFLAGS="-xO2";;
 AC_SUBST(statedir)
 AC_SUBST(libdir)
 AC_SUBST(mandir)
 AC_SUBST(infodir)
 AC_SUBST(infodir_user_defined)
+AC_SUBST(infopath)
 AC_SUBST(lispdir)
 AC_SUBST(lispdir_user_defined)
 AC_SUBST(sitelispdir)
 AC_SUBST(etcdir)
 AC_SUBST(etcdir_user_defined)
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_offix"    = yes && echo "  Compiling in support for OffiX."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_energize" = yes && echo "  Compiling in support for Lucid Energize (doesn't currently work)."
 test "$with_session"  != no && echo "  Compiling in support for proper session-management."
-case  "$with_menubars" in
+case "$with_menubars" in
 lucid ) echo "  Using Lucid menubars." ;;
 motif ) echo "  Using Motif menubars."
 echo "  *WARNING*  The Motif menubar implementation is currently buggy."
 echo "             We recommend using the Lucid menubar instead."
 echo "             Re-run configure with --with-menubars='lucid'." ;;
 case "$with_dialogs" in
 motif    ) echo "  Using Motif dialog boxes."     ;;
 athena   ) echo "  Using Athena dialog boxes."    ;;
 athena3d ) echo "  Using Athena-3d dialog boxes." ;;
 esac
+test "$with_clash_detection" = yes && \
+echo "  Clash detection will use \"$lockdir\" for locking files."
 echo "  movemail will use \"$mail_locking\" for locking mail spool files."
 test "$with_pop"	= yes && echo "  Using POP for mail access"
 test "$with_kerberos"	= yes && echo "  Using Kerberos for POP authentication"
 test "$with_hesiod"	= yes && echo "  Using Hesiod to get POP server host"
+echo "  The \`Info-default-directory-list' will be initialized from:"
+echo "  INFOPATH=\"`echo $infopath`\""
 test "$use_union_type"     = yes && echo "  Using the union type for Lisp_Objects."
 test "$debug"              = yes && echo "  Compiling in extra code for debugging."
 test "$memory_usage_stats" = yes && echo "  Compiling in code for checking XEmacs memory usage."
 test "$usage_tracking"     = yes && echo "  Compiling with usage tracking active (Sun internal)."
 if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc" \

Mercurial > hg > xemacs-beta

comparison configure.in @ 203:850242ba4a81 r20-3b28