emacs: configure comparison

comparison configure @ 83724:fd810038a74e

*** empty log message ***

author	Jan Djärv <jan.h.d@swipnet.se>
date	Wed, 29 Aug 2007 06:36:57 +0000
parents	27d11c1d4e46
children	c0220f0872a3

comparison

equal deleted inserted replaced

-:1ea781b6ce97
+:fd810038a74e
 exitcode=1
 echo positional parameters were not saved.
 fi
 test \$exitcode = 0") || {
-echo Please tell bug-autoconf@gnu.org about your system,
+echo No shell found that supports shell functions.
-echo including any error possibly output before this message.
+echo Please tell autoconf@gnu.org about your system,
-echo This can help us improve future autoconf versions.
+echo including any error possibly output before this
-echo Configuration will now proceed without shell functions.
+echo message
 }
 as_lineno_1=$LINENO
 INSTALL_SCRIPT
 INSTALL_DATA
 RANLIB
 INSTALL_INFO
 GZIP_PROG
+MAKEINFO
 LIBSOUND
 PKG_CONFIG
 ALSA_CFLAGS
 ALSA_LIBS
 CFLAGS_SOUND
 --with-rsvg             use -lrsvg-2 for displaying SVG images
 --with-gtk              use GTK (same as --with-x-toolkit=gtk)
 --with-pkg-config-prog  Path to pkg-config to use for finding GTK and librsvg
 --without-toolkit-scroll-bars
 don't use Motif or Xaw3d scroll bars
+--without-xaw3d         don't use Xaw3d
 --without-xim           don't use X11 XIM
 --without-carbon        don't use Carbon GUI on Mac OS X
 --with-x                use the X Window System
 Some influential environment variables:
 # Check whether --with-toolkit-scroll-bars was given.
 if test "${with_toolkit_scroll_bars+set}" = set; then
 withval=$with_toolkit_scroll_bars;
+fi
+# Check whether --with-xpm was given.
+if test "${with_xpm+set}" = set; then
+withval=$with_xpm;
 fi
 # Check whether --with-xim was given.
 if test "${with_xim+set}" = set; then
 fi
+## Need makeinfo >= 4.6 (?) to build the manuals.
+# Extract the first word of "makeinfo", so it can be a program name with args.
+set dummy makeinfo; 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_path_MAKEINFO+set}" = set; then
+echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+case $MAKEINFO in
+[\\/]* | ?:[\\/]*)
+ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
+;;
+*)
+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_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext"
+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_path_MAKEINFO" && ac_cv_path_MAKEINFO="no"
+;;
+esac
+fi
+MAKEINFO=$ac_cv_path_MAKEINFO
+if test -n "$MAKEINFO"; then
+{ echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+echo "${ECHO_T}$MAKEINFO" >&6; }
+else
+{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+if test "$MAKEINFO" != "no" && \
+test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([5-9]|4\.[6-9])'`" = x; then
+MAKEINFO=no
+fi
+if test "$MAKEINFO" = "no"; then
+{ { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5
+echo "$as_me: error: makeinfo >= 4.6 is required " >&2;}
+{ (exit 1); exit 1; }; }
+fi
 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
 then
 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
 fi
 if test "$with_toolkit_scroll_bars" != no; then
 with_toolkit_scroll_bars=yes
 fi
+HAVE_GTK_MULTIDISPLAY=no
 for ac_func in gdk_display_open
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
 HAVE_XAW3D=no
 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
 if test x"${HAVE_X11R5}" != xyes; then
 USE_X_TOOLKIT=none
 else
-{ echo "$as_me:$LINENO: checking for xaw3d" >&5
+if test "$with_xaw3d" != no; then
+{ echo "$as_me:$LINENO: checking for xaw3d" >&5
 echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; }
 if test "${emacs_cv_xaw3d+set}" = set; then
 echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 fi
+else
+emacs_cv_xaw3d=no
+fi
 if test $emacs_cv_xaw3d = yes; then
 { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5
 echo "${ECHO_T}yes; using Lucid toolkit" >&6; }
 USE_X_TOOLKIT=LUCID
 HAVE_XAW3D=yes
 MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no"
 test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" &&
 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 if test "X${MISSING}" != X; then
-{ { echo "$as_me:$LINENO: error: The following required libraries was not found:
+{ { echo "$as_me:$LINENO: error: The following required libraries were not found:
 $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
 $WITH_NO
 as options to configure" >&5
-echo "$as_me: error: The following required libraries was not found:
+echo "$as_me: error: The following required libraries were not found:
 $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
 $WITH_NO
 as options to configure" >&2;}
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
+#include <stdio.h>
-#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
+#include <stdio.h>
-#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
 RANLIB!$RANLIB$ac_delim
 INSTALL_INFO!$INSTALL_INFO$ac_delim
 GZIP_PROG!$GZIP_PROG$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
 LIBSOUND!$LIBSOUND$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
 ALSA_LIBS!$ALSA_LIBS$ac_delim
 CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim
 lisppath!$lisppath$ac_delim
 x_default_search_path!$x_default_search_path$ac_delim
 etcdir!$etcdir$ac_delim
 archlibdir!$archlibdir$ac_delim
 bitmapdir!$bitmapdir$ac_delim
-gamedir!$gamedir$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
+gamedir!$gamedir$ac_delim
 gameuser!$gameuser$ac_delim
 c_switch_system!$c_switch_system$ac_delim
 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
 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` = 11; then
+if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; 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 @ 83724:fd810038a74e