From: Glenn Morris Date: Wed, 22 Aug 2007 04:20:10 +0000 (+0000) Subject: Regenerate, with shell-func message patch. X-Git-Tag: emacs-pretest-23.0.90~11409 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0cfc054630b638761e3ba2ad157963113751273b;p=emacs.git Regenerate, with shell-func message patch. --- diff --git a/configure b/configure index c91f6431e04..f3737d0a327 100755 --- a/configure +++ b/configure @@ -687,6 +687,8 @@ CFLAGS_SOUND SET_MAKE XMKMF HAVE_XSERVER +RSVG_CFLAGS +RSVG_LIBS GTK_CFLAGS GTK_LIBS XFT_CFLAGS @@ -1341,8 +1343,9 @@ Optional Packages: --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-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 + --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-xim don't use X11 XIM @@ -1949,6 +1952,12 @@ if test "${with_gpm+set}" = set; then fi +# Check whether --with-rsvg was given. +if test "${with_rsvg+set}" = set; then + withval=$with_rsvg; +fi + + # Check whether --with-gtk was given. if test "${with_gtk+set}" = set; then withval=$with_gtk; @@ -9628,16 +9637,16 @@ fi 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 +were found. You should install the relevant development files for X +and 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 +were found. You should install the relevant development files for X +and 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 @@ -11068,6 +11077,130 @@ echo "${ECHO_T}before 5" >&6; } fi fi +### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. +HAVE_RSVG=no +if test "${HAVE_X11}" = "yes"; then + if test "${with_rsvg}" != "no"; then + if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" + fi + + RSVG_REQUIRED=2.0.0 + RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi + + if test "$PKG_CONFIG" = "no" ; then + : + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for $RSVG_MODULE" >&5 +echo $ECHO_N "checking for $RSVG_MODULE... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking RSVG_CFLAGS" >&5 +echo $ECHO_N "checking RSVG_CFLAGS... $ECHO_C" >&6; } + RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $RSVG_CFLAGS" >&5 +echo "${ECHO_T}$RSVG_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking RSVG_LIBS" >&5 +echo $ECHO_N "checking RSVG_LIBS... $ECHO_C" >&6; } + RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $RSVG_LIBS" >&5 +echo "${ECHO_T}$RSVG_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + RSVG_CFLAGS="" + RSVG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + RSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$RSVG_MODULE"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + : + fi + + + + + if test ".${RSVG_CFLAGS}" != "."; then + HAVE_RSVG=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_RSVG 1 +_ACEOF + + CFLAGS="$CFLAGS $RSVG_CFLAGS" + LIBS="$RSVG_LIBS $LIBS" + fi + fi +fi + + HAVE_GTK=no if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then USE_X_TOOLKIT=none @@ -18313,11 +18446,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -18357,11 +18492,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -23514,6 +23651,7 @@ echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" echo " Does Emacs use -ltiff? ${HAVE_TIFF}" echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_gif_lib_name" echo " Does Emacs use -lpng? ${HAVE_PNG}" +echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo @@ -24275,6 +24413,8 @@ CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim SET_MAKE!$SET_MAKE$ac_delim XMKMF!$XMKMF$ac_delim HAVE_XSERVER!$HAVE_XSERVER$ac_delim +RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim +RSVG_LIBS!$RSVG_LIBS$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim GTK_LIBS!$GTK_LIBS$ac_delim XFT_CFLAGS!$XFT_CFLAGS$ac_delim @@ -24299,8 +24439,6 @@ etcdir!$etcdir$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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -24342,6 +24480,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -24353,7 +24493,7 @@ 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` = 9; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5