xemacs-beta: configure.in comparison

comparison configure.in @ 177:6075d714658b r20-3b15

Import from CVS: tag r20-3b15

author	cvs
date	Mon, 13 Aug 2007 09:51:16 +0200
parents	2d532a89d707
children	9ad43877534d

comparison

equal deleted inserted replaced

-:6866abce6aaf
+:6075d714658b
 --with-x (*)		Support the X Window System.
 --with-x=no		Don't support X.
 --x-includes=DIR 	Search for X header files in DIR.
 --x-libraries=DIR	Search for X libraries in DIR.
 --with-toolbars=no	Don't compile with any toolbar support.
+--with-wm		Compile with realized leader window for proper
+			creation of the ApplicationIcon with the
+			WindowMaker windowmanager (SESSION MANAGEMENT).
 --with-menubars=TYPE	Use TYPE menubars (lucid, motif, or no).  The Lucid
 			widgets emulate Motif (mostly) but are faster.
 			*WARNING*  The Motif menubar is currently broken.
 --with-scrollbars=TYPE	Use TYPE scrollbars
 			(lucid, motif, athena, athena3d, or no).
 			This is beta level code.
 --with-wnn6 (*)		Compile with support for WNN version 6
 			This is alpha level code.
 --with-i18n3		Compile with I18N level 3 (support for message
 			translation).  This doesn't currently work.
+--with-xfs		Compile with XFontSet support for bilingual menubar.
+			Can't use this option with --with-xim=motif or xlib.
+			And should have --with-menubars=lucid.
 Debugging options:
 --debug			Compile with support for debugging XEmacs.
 			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.
 --use-system-malloc	Force use of the system malloc, rather than GNU
 			malloc.
+--use-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
 so on.  Note that we recommend against explicitly setting any of these
 variables.  See the INSTALL file for a complete list plus the reasons
 	with_xpm	| \
 	with_xface	| \
 	with_jpeg	| \
 	with_png	| \
 	with_tiff	| \
+	with_wm		| \
 	with_xmu	| \
 	with_quantify	| \
 	with_toolbars	| \
 	with_tty	| \
 	with_i18n3	| \
 eval "$opt=\"$val\""
 	;;
 	dnl Options that take "yes", "no", or "default" values
 	rel_alloc | \
+	use_debug_malloc | \
 	use_system_malloc )
 	  case "$val" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no  ;;
 	    d | de | def | defa | defau | defaul | default )
 	    * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
 \`motif', \`xlib', \`yes', or \`no'."]) ;;
 	  esac
 eval "$opt=\"$val\""
 ;;
+dnl XFontSet support?
+	"with_xfs" )
+	  case "$val" in
+	  y | ye | yes )                val=yes   ;;
+	  n | no | non | none )         val=no    ;;
+	  * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
+\`yes', or \`no'."]) ;;
+	  esac
+	  eval "$opt=\"$val\""
+	;;
 dnl Mail locking specification
 	"mail_locking" )
 	  case "$val" in
 	    lockf )	val=lockf ;;
 linux   ) ld_call_shared="-Bstatic" ;;
 decosf* ) ld_call_shared="-non_shared" ;;
 esac
 fi
-canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'`
+stack_trace_eye_catcher=`echo xemacs_${version}_${canonical} | sed 'y/.-/__/'`
-AC_DEFINE_UNQUOTED(CANONICAL_VERSION, $canonical_version)
+AC_DEFINE_UNQUOTED(STACK_TRACE_EYE_CATCHER, $stack_trace_eye_catcher)
 machfile="m/${machine}.h"
 opsysfile="s/${opsys}.h"
 dnl --------------------------------------------------
 dnl Assume not, until told otherwise.
 GNU_MALLOC=yes
 if test "$system_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(The GNU allocators don't work with this system configuration.)"
+(The GNU allocators don't work with this system configuration)."
 elif test "$use_system_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(User chose not to use GNU allocators.)"
+(User chose not to use GNU allocators)."
+elif test "$use_debug_malloc" = "yes" ; then
+GNU_MALLOC=no
+GNU_MALLOC_reason="
+(User chose to use Debugging Malloc)."
 fi
 dnl Some other nice autoconf tests.  If you add a test here which
 dnl should make an entry in src/config.h, do not forget to add an
 dnl #undef clause to src/config.h.in for autoconf to modify.
 dnl check for long file names
 AC_SYS_LONG_FILE_NAMES
 dnl -lm is required by LISP_FLOAT_TYPE, among other things
 AC_CHECK_LIB(m, sqrt)
-dnl -lPW might be needed on some systems
-dnl But they break more other systems.
-dnl AC_CHECK_LIB(PW, main)
 dnl Floating operation support is now unconditional
 AC_DEFINE(LISP_FLOAT_TYPE)
 dnl Determine type of mail locking from configure args and s&m headers
 if test "$window_system" = "none" ; then
 if test "$with_tty" = "no" ; then
 AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
 fi
-for feature in tooltalk cde offix \
+for feature in tooltalk cde offix wm \
 menubars scrollbars toolbars dialogs xim xmu \
 tiff png jpeg gif compface xpm
 do
 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
 AC_MSG_WARN([--with-$feature ignored:  Not valid without X support])
 case "$x_libraries" in *X11R4* )
 test "$opsys" = "hpux9"     && opsysfile="s/hpux9-x11r4.h"
 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
 esac
+dnl Check for WindowMaker
+AC_CHECKING(for WindowMaker option);
+if test "$with_wm" = "yes"; then
+AC_DEFINE(HAVE_WINDOWMAKER)
+fi
 dnl Autodetect Xauth
 dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
 fi
 if test "$with_xim" = "motif"; then
 AC_DEFINE(XIM_MOTIF)
 need_motif=yes
 XE_ADD_OBJS(input-method-motif.o)
+fi
+if test "$with_xfs" = "yes"; then
+with_xfs=no
+fi
+else dnl "with_xim" = "no"
+case "$with_xfs" in  "yes" )
+AC_CHECKING(for XFontSet)
+AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no)
+esac
+if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then
+AC_DEFINE(USE_XFONTSET)
+XE_ADD_OBJS(input-method-xfs.o)
 fi
 fi dnl with_xim
 dnl Autodetect WNN
 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
 AC_DEFINE(HAVE_INLINE)
 test "$GCC" = "yes" && XE_ADD_OBJS(inline.o)
 fi
 dnl HP-UX has a working alloca in libPW.
-case "$opsys" in hpux* )
+dnl case "${GCC}${opsys}" in hpux* )
-AC_CHECK_FUNC(alloca, [:], [AC_CHECK_LIB(PW, alloca)])
+dnl  AC_CHECK_FUNC(alloca, [:], [AC_CHECK_LIB(PW, alloca)])
-esac
+dnl esac
 AC_FUNC_ALLOCA
 test -n "$ALLOCA" && XE_ADD_OBJS($ALLOCA)
 dnl Check whether vfork exists and works correctly. (This does more
 test -n "$puresize" && AC_DEFINE_UNQUOTED(RAW_PURESIZE, $puresize)
 if   test "$GNU_MALLOC"        = "yes"; then AC_DEFINE(GNU_MALLOC)
 elif test "$use_system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC)
+elif test "$use_debug_malloc"  = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC)
+					     AC_DEFINE(USE_SYSTEM_MALLOC)
 fi
 test "$with_i18n3"         = "yes" && AC_DEFINE(I18N3)
 test "$GCC"                = "yes" && AC_DEFINE(USE_GCC)
 test "$with_term"          = "yes" && AC_DEFINE(HAVE_TERM)
 test "$external_widget"    = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
 test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
 test "$with_xim"      != no && echo "  Compiling in XIM (X11R5+ I18N input method) support."
 test "$with_xim" = motif    && echo "    Using Motif to provide XIM support."
 test "$with_xim" = xlib     && echo "    Using raw Xlib to provide XIM support."
+test "$with_xfs" = yes      && echo "    Using XFontSet to provide bilingual menubar."
 test "$with_canna"    = yes && echo "  Compiling in support for Canna on Mule."
 if test "$with_wnn" = yes; then
 echo "  Compiling in support for the WNN input method on Mule."
 test "$with_wnn6" = yes && echo "    Using WNN version 6."
 fi
 test "$with_cde"      = yes && echo "  Compiling in support for CDE."
 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_wm"       = yes && echo "  Compiling in support for WindowMaker."
 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."

Mercurial > hg > xemacs-beta

comparison configure.in @ 177:6075d714658b r20-3b15