emacs: configure comparison

comparison configure @ 83644:0ece58f6e0aa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 803-813) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 51-58) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-236) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25

author	Miles Bader <miles@gnu.org>
date	Sun, 15 Jul 2007 02:05:20 +0000
parents	9c01792a3ce8 f5538958a28a
children	27d11c1d4e46

comparison

equal deleted inserted replaced

-:70b38dec13a1
+:0ece58f6e0aa
 ALSA_CFLAGS
 ALSA_LIBS
 CFLAGS_SOUND
 SET_MAKE
 XMKMF
+HAVE_XSERVER
 GTK_CFLAGS
 GTK_LIBS
 XFT_CFLAGS
 XFT_LIBS
 ALLOCA
 --with-x-toolkit=KIT    use an X toolkit
 (KIT = yes/lucid/athena/motif/gtk/no)
 --with-xpm              use -lXpm for displaying XPM images
 --with-jpeg             use -ljpeg for displaying JPEG images
 --with-tiff             use -ltiff for displaying TIFF images
---with-gif              use -lungif (or -lgif) for displaying GIF images
+--with-gif              use -lgif (or -lungif) for displaying GIF images
 --with-png              use -lpng for displaying PNG images
 --with-gpm              use -lgpm for mouse support on a GNU/Linux console
 --with-gtk              use GTK (same as --with-x-toolkit=gtk)
 --with-pkg-config-prog  Path to pkg-config to use for finding GTK
 --without-toolkit-scroll-bars
 HAVE_X11=no
 USE_X_TOOLKIT=none
 ;;
 esac
+if test "$window_system" = none && test "X$with_x" != "Xno"; then
+# Extract the first word of "X", so it can be a program name with args.
+set dummy X; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_HAVE_XSERVER+set}" = set; then
+echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+if test -n "$HAVE_XSERVER"; then
+ac_cv_prog_HAVE_XSERVER="$HAVE_XSERVER" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+IFS=$as_save_IFS
+test -z "$as_dir" && as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ac_cv_prog_HAVE_XSERVER="true"
+echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+break 2
+fi
+done
+done
+IFS=$as_save_IFS
+test -z "$ac_cv_prog_HAVE_XSERVER" && ac_cv_prog_HAVE_XSERVER="false"
+fi
+fi
+HAVE_XSERVER=$ac_cv_prog_HAVE_XSERVER
+if test -n "$HAVE_XSERVER"; then
+{ echo "$as_me:$LINENO: result: $HAVE_XSERVER" >&5
+echo "${ECHO_T}$HAVE_XSERVER" >&6; }
+else
+{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+if test "$HAVE_XSERVER" = true ||
+test -n "$DISPLAY" ||
+test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
+{ { echo "$as_me:$LINENO: error: You seem to be running X, but no X development libraries
+where found.  You should install the relevant development files for X
+and the for the toolkit you want, such as Gtk+, Lesstif or Motif.  Also make
+sure you have development files for image handling, i.e.
+tiff, gif, jpeg, png and xpm.
+If you are sure you want Emacs compiled without X window support, pass
+--without-x
+to configure." >&5
+echo "$as_me: error: You seem to be running X, but no X development libraries
+where found.  You should install the relevant development files for X
+and the for the toolkit you want, such as Gtk+, Lesstif or Motif.  Also make
+sure you have development files for image handling, i.e.
+tiff, gif, jpeg, png and xpm.
+If you are sure you want Emacs compiled without X window support, pass
+--without-x
+to configure." >&2;}
+{ (exit 1); exit 1; }; }
+fi
+fi
 ### If we're using X11, we should use the X menu package.
 HAVE_MENUS=no
 case ${HAVE_X11} in
 yes ) HAVE_MENUS=yes ;;
 esac
 fi
 if test $ac_cv_header_gif_lib_h = yes; then
 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 # Earlier versions can crash Emacs.
-{ echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5
+{ echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5
-echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; }
+echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
+if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then
 echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 ac_check_lib_save_LIBS=$LIBS
-LIBS="-lungif  $LIBS"
+LIBS="-lgif  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext &&
 $as_test_x conftest$ac_exeext; then
-ac_cv_lib_ungif_EGifPutExtensionLast=yes
+ac_cv_lib_gif_EGifPutExtensionLast=yes
 else
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-	ac_cv_lib_ungif_EGifPutExtensionLast=no
+	ac_cv_lib_gif_EGifPutExtensionLast=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
-echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
+echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
+if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then
 HAVE_GIF=yes
 else
-try_libgif=yes
+try_libungif=yes
 fi
 fi
 if test "$HAVE_GIF" = yes; then
-ac_gif_lib_name="-lungif"
+ac_gif_lib_name="-lgif"
 fi
-# If gif_lib.h but no libungif, try libgif.
+# If gif_lib.h but no libgif, try libungif.
-if test x"$try_libgif" = xyes; then
+if test x"$try_libungif" = xyes; then
-{ echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5
+{ echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5
-echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; }
+echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then
+if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
 echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgif  $LIBS"
+LIBS="-lungif  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext &&
 $as_test_x conftest$ac_exeext; then
-ac_cv_lib_gif_EGifPutExtensionLast=yes
+ac_cv_lib_ungif_EGifPutExtensionLast=yes
 else
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-	ac_cv_lib_gif_EGifPutExtensionLast=no
+	ac_cv_lib_ungif_EGifPutExtensionLast=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
-echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
+echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then
+if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
 HAVE_GIF=yes
 fi
 if test "$HAVE_GIF" = yes; then
 cat >>confdefs.h <<\_ACEOF
-#define LIBGIF -lgif
+#define LIBGIF -lungif
 _ACEOF
-ac_gif_lib_name="-lgif"
+ac_gif_lib_name="-lungif"
 fi
 fi
 if test "${HAVE_GIF}" = "yes"; then
 ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
 ALSA_LIBS!$ALSA_LIBS$ac_delim
 CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim
 SET_MAKE!$SET_MAKE$ac_delim
 XMKMF!$XMKMF$ac_delim
+HAVE_XSERVER!$HAVE_XSERVER$ac_delim
 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
 GTK_LIBS!$GTK_LIBS$ac_delim
 XFT_CFLAGS!$XFT_CFLAGS$ac_delim
 XFT_LIBS!$XFT_LIBS$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 archlibdir!$archlibdir$ac_delim
 bitmapdir!$bitmapdir$ac_delim
 gamedir!$gamedir$ac_delim
 gameuser!$gameuser$ac_delim
 c_switch_system!$c_switch_system$ac_delim
-c_switch_machine!$c_switch_machine$ac_delim
 _ACEOF
 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 break
 elif $ac_last_try; then
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
 cat >conf$$subs.sed <<_ACEOF
+c_switch_machine!$c_switch_machine$ac_delim
 LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim
 LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim
 C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim
 X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim
 machfile!$machfile$ac_delim
 opsysfile!$opsysfile$ac_delim
 carbon_appdir!$carbon_appdir$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
-if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
+if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
 break
 elif $ac_last_try; then
 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 { (exit 1); exit 1; }; }

Mercurial > emacs

comparison configure @ 83644:0ece58f6e0aa