[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
imagemagick patch v1
|
From: |
joakim |
|
Subject: |
imagemagick patch v1 |
|
Date: |
Sat, 01 Aug 2009 21:47:04 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (gnu/linux) |
The attached patch is a 1st stab at making it possible to use the
imagemagick library to load images in emacs.
I can load GIMP XCF and DJVU files like this:
src/emacs -q --eval "(insert-image (create-image \"/tmp/tst.xcf\" 'imagemagick)
)"
It works with any image format supported by imagemagick, find out which
with:
identify -list format
This patch does not replace the current image loading code, it merely
adds imagemagick as a possible file loader.
(The 1st part of the patch are merely changes to "configure", ignore
those please. The patch was generated with "git diff imagemagick master
>imagemagick1.patch" and configure is a managed file for some reason.)
diff --git a/configure b/configure
index 5c42c97..34d6806 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for emacs 23.1.50.
+# Generated by GNU Autoconf 2.62 for emacs 23.1.50.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -638,135 +638,133 @@ ac_includes_default="\
ac_config_libobj_dir=src
ac_header_list=
ac_func_list=
-ac_subst_vars='LTLIBOBJS
-LIB_SRC_EXTRA_INSTALLABLES
-GNU_OBJC_CFLAGS
-GNUSTEP_SYSTEM_LIBRARIES
-GNUSTEP_SYSTEM_HEADERS
-GNUSTEP_MAKEFILES
-ns_appsrc
-ns_appresdir
-ns_appbindir
-ns_appdir
-opsysfile
-machfile
-X_TOOLKIT_TYPE
-C_SWITCH_X_SITE
-LD_SWITCH_X_SITE_AUX
-LD_SWITCH_X_SITE
-c_switch_machine
-c_switch_system
-gameuser
-gamedir
-bitmapdir
-archlibdir
-etcdir
-x_default_search_path
-lisppath
-locallisppath
-lispdir
-srcdir
-canonical
-configuration
-version
-GETOPTOBJS
-GETOPT_H
-GETLOADAVG_LIBS
-KMEM_GROUP
-NEED_SETGID
-LIBOBJS
-liblockfile
-ALLOCA
-FREETYPE_LIBS
-FREETYPE_CFLAGS
-M17N_FLT_LIBS
-M17N_FLT_CFLAGS
-LIBOTF_LIBS
-LIBOTF_CFLAGS
-XFT_LIBS
-XFT_CFLAGS
-FONTCONFIG_LIBS
-FONTCONFIG_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-IMAGEMAGICK_LIBS
-IMAGEMAGICK_CFLAGS
-RSVG_LIBS
-RSVG_CFLAGS
-HAVE_XSERVER
-XMKMF
-SET_MAKE
-CFLAGS_SOUND
-ALSA_LIBS
-ALSA_CFLAGS
-PKG_CONFIG
-LIBSOUND
-MAKEINFO
-GZIP_PROG
-INSTALL_INFO
-RANLIB
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-LN_S
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-MAINT
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
+ac_subst_vars='SHELL
PATH_SEPARATOR
-SHELL'
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+MAINT
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+CPP
+GREP
+EGREP
+LN_S
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+RANLIB
+INSTALL_INFO
+GZIP_PROG
+MAKEINFO
+LIBSOUND
+PKG_CONFIG
+ALSA_CFLAGS
+ALSA_LIBS
+CFLAGS_SOUND
+SET_MAKE
+XMKMF
+HAVE_XSERVER
+RSVG_CFLAGS
+RSVG_LIBS
+GTK_CFLAGS
+GTK_LIBS
+DBUS_CFLAGS
+DBUS_LIBS
+FONTCONFIG_CFLAGS
+FONTCONFIG_LIBS
+XFT_CFLAGS
+XFT_LIBS
+LIBOTF_CFLAGS
+LIBOTF_LIBS
+M17N_FLT_CFLAGS
+M17N_FLT_LIBS
+FREETYPE_CFLAGS
+FREETYPE_LIBS
+ALLOCA
+liblockfile
+LIBOBJS
+NEED_SETGID
+KMEM_GROUP
+GETLOADAVG_LIBS
+GETOPT_H
+GETOPTOBJS
+version
+configuration
+canonical
+srcdir
+lispdir
+locallisppath
+lisppath
+x_default_search_path
+etcdir
+archlibdir
+bitmapdir
+gamedir
+gameuser
+c_switch_system
+c_switch_machine
+LD_SWITCH_X_SITE
+LD_SWITCH_X_SITE_AUX
+C_SWITCH_X_SITE
+X_TOOLKIT_TYPE
+machfile
+opsysfile
+ns_appdir
+ns_appbindir
+ns_appresdir
+ns_appsrc
+GNUSTEP_MAKEFILES
+GNUSTEP_SYSTEM_HEADERS
+GNUSTEP_SYSTEM_LIBRARIES
+GNU_OBJC_CFLAGS
+LIB_SRC_EXTRA_INSTALLABLES
+LTLIBOBJS'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -783,7 +781,6 @@ with_tiff
with_gif
with_png
with_rsvg
-with_imagemagick
with_xft
with_libotf
with_m17n_flt
@@ -1239,9 +1236,9 @@ fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options:
$ac_unrecognized_opts" >&2
+ fatal) { $as_echo "$as_me: error: Unrecognized options:
$ac_unrecognized_opts" >&2
{ (exit 1); exit 1; }; } ;;
- *) $as_echo "$as_me: WARNING: unrecognized options:
$ac_unrecognized_opts" >&2 ;;
+ *) $as_echo "$as_me: WARNING: Unrecognized options:
$ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1294,7 +1291,7 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: Working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
{ $as_echo "$as_me: error: pwd does not report name of working directory" >&2
@@ -1486,7 +1483,6 @@ Optional Packages:
--without-gif don't compile with GIF image support
--without-png don't compile with PNG image support
--without-rsvg don't compile with SVG image support
- --without-imagemagick dont compile with imagemagick image support
--without-xft don't use XFT for anti aliased fonts
--without-libotf don't use libotf for OpenType font support
--without-m17n-flt don't use m17n-flt for text shaping
@@ -1584,7 +1580,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 23.1.50
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1598,7 +1594,7 @@ This file contains any messages produced by compilers
while
running configure, to aid debugging if configure makes a mistake.
It was created by emacs $as_me 23.1.50, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -1721,8 +1717,8 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var
contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var
contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -1928,8 +1924,6 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:$LINENO: error: changes in the environment can compromise
the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build"
>&2;}
{ { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm
$cache_file' and start over" >&5
@@ -2166,15 +2160,6 @@ else
fi
-# Check whether --with-imagemagick was given.
-if test "${with_imagemagick+set}" = set; then
- withval=$with_imagemagick;
-else
- with_imagemagick=yes
-fi
-
-
-
# Check whether --with-xft was given.
if test "${with_xft+set}" = set; then
@@ -2234,8 +2219,6 @@ fi
-
-
# Check whether --with-gpm was given.
if test "${with_gpm+set}" = set; then
withval=$with_gpm;
@@ -3044,8 +3027,12 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3244,8 +3231,12 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3255,13 +3246,11 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler
found in \$PATH
See \`config.log' for more details." >&5
$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
# Provide some information about the compiler.
$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -3391,13 +3380,11 @@ if test -z "$ac_file"; then
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
$as_echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+ { (exit 77); exit 77; }; }
fi
ac_exeext=$ac_cv_exeext
@@ -3425,15 +3412,13 @@ $as_echo "$ac_try_echo") >&5
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
fi
fi
@@ -3476,13 +3461,11 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables:
cannot compile and link
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables:
cannot compile and link
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile
and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
@@ -3536,13 +3519,11 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files:
cannot compile
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -4214,13 +4195,11 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
See \`config.log' for more details." >&5
$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
ac_ext=c
@@ -4603,9 +4582,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -4743,7 +4721,7 @@ fi
$as_echo "$ac_cv_header_minix_config_h" >&6; }
fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
+if test $ac_cv_header_minix_config_h = yes; then
MINIX=yes
else
MINIX=
@@ -5135,13 +5113,11 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
See \`config.log' for more details." >&5
$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
ac_ext=c
@@ -5326,8 +5302,12 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -6296,9 +6276,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6373,7 +6352,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then
+if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
LIBSOUND=-lossaudio
else
LIBSOUND=
@@ -6751,9 +6730,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6866,9 +6844,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7170,7 +7147,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
+if test $ac_cv_have_decl_sys_siglist = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_SYS_SIGLIST 1
@@ -7241,7 +7218,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___sys_siglist" >&5
$as_echo "$ac_cv_have_decl___sys_siglist" >&6; }
-if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then
+if test $ac_cv_have_decl___sys_siglist = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL___SYS_SIGLIST 1
@@ -7783,9 +7760,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7848,9 +7824,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -8023,7 +7998,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
$as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then
+if test $ac_cv_member_struct_tm_tm_zone = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_TM_TM_ZONE 1
@@ -8093,7 +8068,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
$as_echo "$ac_cv_have_decl_tzname" >&6; }
-if test "x$ac_cv_have_decl_tzname" = x""yes; then
+if test $ac_cv_have_decl_tzname = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_TZNAME 1
@@ -8274,7 +8249,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then
+if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_TM_GMTOFF 1
@@ -8391,7 +8366,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_flags" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_flags" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_flags = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_FLAGS 1
@@ -8508,7 +8483,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_hwaddr" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_hwaddr" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_hwaddr = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
@@ -8625,7 +8600,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_netmask" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_netmask = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_NETMASK 1
@@ -8742,7 +8717,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr"
>&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_broadaddr = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1
@@ -8859,7 +8834,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_addr" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_addr" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_addr = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_ADDR 1
@@ -9216,8 +9191,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names
containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+ *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names
containing '" >&5
+$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
{ (exit 1); exit 1; }; };; #(
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -9255,7 +9230,7 @@ _ACEOF
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
- /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ /usr/lib | /lib) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
esac
fi
@@ -9664,7 +9639,7 @@ fi
$as_echo "$ac_cv_header_AppKit_AppKit_h" >&6; }
fi
-if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then
+if test $ac_cv_header_AppKit_AppKit_h = yes; then
HAVE_NS=yes
else
{ { $as_echo "$as_me:$LINENO: error: \`--with-ns' was specified, but the
include
@@ -9912,7 +9887,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5
$as_echo "$ac_cv_func_malloc_get_state" >&6; }
-if test "x$ac_cv_func_malloc_get_state" = x""yes; then
+if test $ac_cv_func_malloc_get_state = yes; then
:
else
doug_lea_malloc=no
@@ -10003,7 +9978,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5
$as_echo "$ac_cv_func_malloc_set_state" >&6; }
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then
+if test $ac_cv_func_malloc_set_state = yes; then
:
else
doug_lea_malloc=no
@@ -10225,9 +10200,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -10327,9 +10301,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -10598,7 +10571,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNET 1
_ACEOF
@@ -10667,7 +10640,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = x""yes; then
+if test $ac_cv_lib_Xbsd_main = yes; then
LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
fi
@@ -10738,7 +10711,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5
$as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
-if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then
+if test $ac_cv_lib_pthreads_cma_open = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREADS 1
_ACEOF
@@ -11121,9 +11094,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11323,121 +11295,6 @@ _ACEOF
fi
fi
-HAVE_IMAGEMAGICK=no
-if test "${HAVE_X11}" = "yes" ; then
- if test "${with_imagemagick}" != "no"; then
- IMAGEMAGICK_REQUIRED=1
- IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED"
-
-
- succeeded=no
-
- # Extract the first word of "pkg-config", so it can be a program name with
args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&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"
- $as_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
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-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
- { $as_echo "$as_me:$LINENO: checking for $IMAGEMAGICK_MODULE" >&5
-$as_echo_n "checking for $IMAGEMAGICK_MODULE... " >&6; }
-
- if $PKG_CONFIG --exists "$IMAGEMAGICK_MODULE" 2>&5; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- succeeded=yes
-
- { $as_echo "$as_me:$LINENO: checking IMAGEMAGICK_CFLAGS" >&5
-$as_echo_n "checking IMAGEMAGICK_CFLAGS... " >&6; }
- IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed
-e 's,///*,/,g'`
- { $as_echo "$as_me:$LINENO: result: $IMAGEMAGICK_CFLAGS" >&5
-$as_echo "$IMAGEMAGICK_CFLAGS" >&6; }
-
- { $as_echo "$as_me:$LINENO: checking IMAGEMAGICK_LIBS" >&5
-$as_echo_n "checking IMAGEMAGICK_LIBS... " >&6; }
- IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "$IMAGEMAGICK_MODULE"|sed -e
's,///*,/,g'`
- { $as_echo "$as_me:$LINENO: result: $IMAGEMAGICK_LIBS" >&5
-$as_echo "$IMAGEMAGICK_LIBS" >&6; }
- else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- IMAGEMAGICK_CFLAGS=""
- IMAGEMAGICK_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "$IMAGEMAGICK_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 ".${IMAGEMAGICK_CFLAGS}" != "."; then
- HAVE_IMAGEMAGICK=yes
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAGEMAGICK 1
-_ACEOF
-
- CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
- LIBS="$IMAGEMAGICK_LIBS $LIBS"
- fi
- fi
-fi
HAVE_GTK=no
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
@@ -11646,9 +11503,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11786,9 +11642,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11860,7 +11715,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION"
>&5
$as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" >&6; }
-if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then
+if test $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION = yes; then
HAVE_GTK_FILE_SELECTION=yes
else
HAVE_GTK_FILE_SELECTION=no
@@ -11958,9 +11813,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12028,7 +11882,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&5
$as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&6; }
-if test "x$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" = x""yes; then
+if test $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER = yes; then
HAVE_GTK_FILE_CHOOSER=yes
else
HAVE_GTK_FILE_CHOOSER=no
@@ -12126,9 +11980,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12286,9 +12139,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12363,7 +12215,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5
$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then
+if test $ac_cv_lib_pthread_pthread_self = yes; then
HAVE_GTK_AND_PTHREAD=yes
fi
@@ -12780,7 +12632,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result:
$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
$as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then
+if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXMU 1
_ACEOF
@@ -12861,7 +12713,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
+if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXEXT 1
_ACEOF
@@ -13001,7 +12853,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5
$as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; }
-if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then
+if test $ac_cv_lib_Xp_XpCreateContext = yes; then
HAVE_LIBXP=yes
fi
@@ -13592,7 +13444,7 @@ fi
$as_echo "$ac_cv_header_X11_Xft_Xft_h" >&6; }
fi
-if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then
+if test $ac_cv_header_X11_Xft_Xft_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
@@ -13658,7 +13510,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then
+if test $ac_cv_lib_Xft_XftFontOpen = yes; then
HAVE_XFT=yes
fi
@@ -13869,7 +13721,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_otf_OTF_get_variation_glyphs"
>&5
$as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; }
-if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then
+if test $ac_cv_lib_otf_OTF_get_variation_glyphs = yes; then
HAVE_OTF_GET_VARIATION_GLYPHS=yes
else
HAVE_OTF_GET_VARIATION_GLYPHS=no
@@ -14140,7 +13992,7 @@ fi
$as_echo "$ac_cv_header_X11_xpm_h" >&6; }
fi
-if test "x$ac_cv_header_X11_xpm_h" = x""yes; then
+if test $ac_cv_header_X11_xpm_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5
$as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; }
if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then
@@ -14206,7 +14058,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
$as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; }
-if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then
+if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then
HAVE_XPM=yes
fi
@@ -14387,7 +14239,7 @@ fi
$as_echo "$ac_cv_header_jerror_h" >&6; }
fi
-if test "x$ac_cv_header_jerror_h" = x""yes; then
+if test $ac_cv_header_jerror_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5
$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then
@@ -14453,7 +14305,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then
+if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then
HAVE_JPEG=yes
fi
@@ -14636,9 +14488,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14713,7 +14564,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5
$as_echo "$ac_cv_lib_png_png_get_channels" >&6; }
-if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then
+if test $ac_cv_lib_png_png_get_channels = yes; then
HAVE_PNG=yes
fi
@@ -14860,7 +14711,7 @@ fi
$as_echo "$ac_cv_header_tiffio_h" >&6; }
fi
-if test "x$ac_cv_header_tiffio_h" = x""yes; then
+if test $ac_cv_header_tiffio_h = yes; then
tifflibs="-lz -lm"
# At least one tiff package requires the jpeg library.
if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
@@ -14929,7 +14780,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
$as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then
+if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then
HAVE_TIFF=yes
fi
@@ -15077,7 +14928,7 @@ fi
$as_echo "$ac_cv_header_gif_lib_h" >&6; }
fi
-if test "x$ac_cv_header_gif_lib_h" = x""yes; then
+if test $ac_cv_header_gif_lib_h = yes; then
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs.
{ $as_echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5
@@ -15145,7 +14996,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then
+if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then
HAVE_GIF=yes
else
try_libungif=yes
@@ -15226,7 +15077,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then
+if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
HAVE_GIF=yes
fi
@@ -15411,7 +15262,7 @@ fi
$as_echo "$ac_cv_header_gpm_h" >&6; }
fi
-if test "x$ac_cv_header_gpm_h" = x""yes; then
+if test $ac_cv_header_gpm_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5
$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
@@ -15477,7 +15328,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Open" >&5
$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then
+if test $ac_cv_lib_gpm_Gpm_Open = yes; then
HAVE_GPM=yes
fi
@@ -15621,7 +15472,7 @@ fi
$as_echo "$ac_cv_header_malloc_malloc_h" >&6; }
fi
-if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then
+if test $ac_cv_header_malloc_malloc_h = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_MALLOC_MALLOC_H 1
@@ -15796,7 +15647,7 @@ fi
$as_echo "$ac_cv_header_X11_SM_SMlib_h" >&6; }
fi
-if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then
+if test $ac_cv_header_X11_SM_SMlib_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
@@ -15862,7 +15713,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
-if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then
+if test $ac_cv_lib_SM_SmcOpenConnection = yes; then
HAVE_X_SM=yes
fi
@@ -16228,9 +16079,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -16399,7 +16249,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = x""yes; then
+if test $ac_cv_lib_m_sqrt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -16477,7 +16327,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5
$as_echo "$ac_cv_lib_mail_maillock" >&6; }
-if test "x$ac_cv_lib_mail_maillock" = x""yes; then
+if test $ac_cv_lib_mail_maillock = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBMAIL 1
_ACEOF
@@ -16552,7 +16402,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5
$as_echo "$ac_cv_lib_lockfile_maillock" >&6; }
-if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then
+if test $ac_cv_lib_lockfile_maillock = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLOCKFILE 1
_ACEOF
@@ -16706,9 +16556,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -16851,9 +16700,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17033,9 +16881,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17179,9 +17026,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17329,9 +17175,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17438,9 +17283,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17825,7 +17669,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5
$as_echo "$ac_cv_func_getloadavg" >&6; }
-if test "x$ac_cv_func_getloadavg" = x""yes; then
+if test $ac_cv_func_getloadavg = yes; then
exit 0
else
exit 1
@@ -17924,9 +17768,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -18002,7 +17845,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then
+if test $ac_cv_lib_kstat_kstat_open = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKSTAT 1
_ACEOF
@@ -18083,7 +17926,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5
$as_echo "$ac_cv_lib_elf_elf_begin" >&6; }
-if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then
+if test $ac_cv_lib_elf_elf_begin = yes; then
LIBS="-lelf $LIBS"
fi
@@ -18154,7 +17997,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then
+if test $ac_cv_lib_kvm_kvm_open = yes; then
LIBS="-lkvm $LIBS"
fi
@@ -18224,7 +18067,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5
$as_echo "$ac_cv_lib_util_getloadavg" >&6; }
-if test "x$ac_cv_lib_util_getloadavg" = x""yes; then
+if test $ac_cv_lib_util_getloadavg = yes; then
LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
fi
@@ -18300,7 +18143,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5
$as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; }
-if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then
+if test $ac_cv_lib_getloadavg_getloadavg = yes; then
LIBS="-lgetloadavg $LIBS"
else
LIBS=$ac_getloadavg_LIBS
@@ -18401,9 +18244,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -18549,7 +18391,7 @@ fi
$as_echo "$ac_cv_header_sys_dg_sys_info_h" >&6; }
fi
-if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then
+if test $ac_cv_header_sys_dg_sys_info_h = yes; then
ac_have_func=yes
cat >>confdefs.h <<\_ACEOF
@@ -18622,7 +18464,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5
$as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; }
-if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then
+if test $ac_cv_lib_dgc_dg_sys_info = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDGC 1
_ACEOF
@@ -18855,9 +18697,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19006,7 +18847,7 @@ fi
$as_echo "$ac_cv_header_inq_stats_cpustats_h" >&6; }
fi
-if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then
+if test $ac_cv_header_inq_stats_cpustats_h = yes; then
ac_have_func=yes
cat >>confdefs.h <<\_ACEOF
@@ -19151,7 +18992,7 @@ fi
$as_echo "$ac_cv_header_sys_cpustats_h" >&6; }
fi
-if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then
+if test $ac_cv_header_sys_cpustats_h = yes; then
ac_have_func=yes; cat >>confdefs.h <<\_ACEOF
#define UMAX 1
_ACEOF
@@ -19297,9 +19138,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19445,9 +19285,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19548,7 +19387,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
$as_echo "$ac_cv_member_struct_nlist_n_un_n_name" >&6; }
-if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then
+if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1
@@ -19929,9 +19768,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -20034,9 +19872,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20103,7 +19940,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
$as_echo "$ac_cv_have_decl_optreset" >&6; }
-if test "x$ac_cv_have_decl_optreset" = x""yes; then
+if test $ac_cv_have_decl_optreset = yes; then
GETOPT_H=getopt.h
fi
@@ -20170,7 +20007,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5
$as_echo "$ac_cv_have_decl_getopt_clip" >&6; }
-if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then
+if test $ac_cv_have_decl_getopt_clip = yes; then
gl_cv_func_gnu_getopt=no
else
gl_cv_func_gnu_getopt=yes
@@ -20415,9 +20252,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20489,7 +20325,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = x""yes; then
+if test $ac_cv_lib_intl_strftime = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
@@ -20593,9 +20429,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20696,9 +20531,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20777,7 +20611,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tparm" >&5
$as_echo "$ac_cv_lib_ncurses_tparm" >&6; }
-if test "x$ac_cv_lib_ncurses_tparm" = x""yes; then
+if test $ac_cv_lib_ncurses_tparm = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNCURSES 1
_ACEOF
@@ -20997,7 +20831,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5
$as_echo "$ac_cv_func_res_send" >&6; }
-if test "x$ac_cv_func_res_send" = x""yes; then
+if test $ac_cv_func_res_send = yes; then
:
else
{ $as_echo "$as_me:$LINENO: checking for __res_send" >&5
@@ -21085,7 +20919,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5
$as_echo "$ac_cv_func___res_send" >&6; }
-if test "x$ac_cv_func___res_send" = x""yes; then
+if test $ac_cv_func___res_send = yes; then
:
else
{ $as_echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5
@@ -21153,7 +20987,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5
$as_echo "$ac_cv_lib_resolv_res_send" >&6; }
-if test "x$ac_cv_lib_resolv_res_send" = x""yes; then
+if test $ac_cv_lib_resolv_res_send = yes; then
resolv=yes
else
{ $as_echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5
@@ -21221,7 +21055,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5
$as_echo "$ac_cv_lib_resolv___res_send" >&6; }
-if test "x$ac_cv_lib_resolv___res_send" = x""yes; then
+if test $ac_cv_lib_resolv___res_send = yes; then
resolv=yes
fi
@@ -21321,7 +21155,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5
$as_echo "$ac_cv_func_hes_getmailhost" >&6; }
-if test "x$ac_cv_func_hes_getmailhost" = x""yes; then
+if test $ac_cv_func_hes_getmailhost = yes; then
:
else
{ $as_echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5
@@ -21389,7 +21223,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
$as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; }
-if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then
+if test $ac_cv_lib_hesiod_hes_getmailhost = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBHESIOD 1
@@ -21480,7 +21314,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = x""yes; then
+if test $ac_cv_lib_com_err_com_err = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCOM_ERR 1
_ACEOF
@@ -21555,7 +21389,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt"
>&5
$as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBK5CRYPTO 1
_ACEOF
@@ -21630,7 +21464,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
@@ -21705,7 +21539,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5
$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; }
-if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then
+if test $ac_cv_lib_krb5_krb5_init_context = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
@@ -21781,7 +21615,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDES425 1
_ACEOF
@@ -21855,7 +21689,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_des_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDES 1
_ACEOF
@@ -21932,7 +21766,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5
$as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then
+if test $ac_cv_lib_krb4_krb_get_cred = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB4 1
_ACEOF
@@ -22006,7 +21840,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5
$as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then
+if test $ac_cv_lib_krb_krb_get_cred = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB 1
_ACEOF
@@ -22155,9 +21989,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22258,7 +22091,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text" >&5
$as_echo "$ac_cv_member_krb5_error_text" >&6; }
-if test "x$ac_cv_member_krb5_error_text" = x""yes; then
+if test $ac_cv_member_krb5_error_text = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ERROR_TEXT 1
@@ -22363,7 +22196,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_text" >&5
$as_echo "$ac_cv_member_krb5_error_e_text" >&6; }
-if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then
+if test $ac_cv_member_krb5_error_e_text = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ERROR_E_TEXT 1
@@ -22512,9 +22345,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22655,9 +22487,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22798,9 +22629,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22952,9 +22782,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23095,9 +22924,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23238,9 +23066,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23393,9 +23220,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23474,7 +23300,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
+if test $ac_cv_lib_intl_dgettext = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
@@ -23674,9 +23500,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -23842,7 +23667,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest_ipa8_conftest.oo \
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
$as_echo "$ac_cv_func_socket" >&6; }
-if test "x$ac_cv_func_socket" = x""yes; then
+if test $ac_cv_func_socket = yes; then
:
else
ok_so_far=no
@@ -23976,7 +23801,7 @@ fi
$as_echo "$ac_cv_header_netinet_in_h" >&6; }
fi
-if test "x$ac_cv_header_netinet_in_h" = x""yes; then
+if test $ac_cv_header_netinet_in_h = yes; then
:
else
ok_so_far=no
@@ -24112,7 +23937,7 @@ fi
$as_echo "$ac_cv_header_arpa_inet_h" >&6; }
fi
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then
+if test $ac_cv_header_arpa_inet_h = yes; then
:
else
ok_so_far=no
@@ -24263,9 +24088,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -24392,7 +24216,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
+if test $ac_cv_type_pid_t = yes; then
:
else
@@ -24537,9 +24361,8 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -24640,9 +24463,8 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -25066,7 +24888,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
+if test $ac_cv_type_size_t = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_SIZE_T 1
@@ -25503,7 +25325,6 @@ 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 imagemagick?
${HAVE_IMAGEMAGICK}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
@@ -25622,8 +25443,8 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var
contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var
contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -26015,7 +25836,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by emacs $as_me 23.1.50, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -26028,15 +25849,6 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
_ACEOF
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
@@ -26050,17 +25862,16 @@ ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet, --silent
- do not print progress messages
+ -q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
+ --file=FILE[:TEMPLATE]
instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
+ --header=FILE[:TEMPLATE]
instantiate the configuration header FILE
Configuration files:
@@ -26078,7 +25889,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
emacs config.status 23.1.50
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2008 Free Software Foundation, Inc.
@@ -26292,8 +26103,7 @@ for ac_last_try in false false false false false :; do
$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` =
$ac_delim_num; then
break
elif $ac_last_try; then
{ { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -26498,9 +26308,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
}
split(mac1, mac2, "(") #)
macro = mac2[1]
- prefix = substr(line, 1, index(line, defundef) - 1)
if (D_is_set[macro]) {
# Preserve the white space surrounding the "#".
+ prefix = substr(line, 1, index(line, defundef) - 1)
print prefix "define", macro P[macro] D[macro]
next
} else {
@@ -26508,7 +26318,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
+ print "/*", line, "*/"
next
}
}
@@ -26532,8 +26342,8 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -26921,8 +26731,8 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no;
then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options:
$ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options:
$ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff --git a/configure.in b/configure.in
index c4207d8..f4096db 100644
--- a/configure.in
+++ b/configure.in
@@ -132,8 +132,6 @@ OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image
support])
OPTION_DEFAULT_ON([gif],[don't compile with GIF image support])
OPTION_DEFAULT_ON([png],[don't compile with PNG image support])
OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support])
-OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support])
-
OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support])
@@ -144,8 +142,6 @@ OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system])
-
-
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux
console])
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
@@ -1593,24 +1589,6 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" =
"yes"; then
fi
fi
-HAVE_IMAGEMAGICK=no
-if test "${HAVE_X11}" = "yes" ; then
- if test "${with_imagemagick}" != "no"; then
- IMAGEMAGICK_REQUIRED=1
- IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED"
-
- PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :)
- AC_SUBST(IMAGEMAGICK_CFLAGS)
- AC_SUBST(IMAGEMAGICK_LIBS)
-
- if test ".${IMAGEMAGICK_CFLAGS}" != "."; then
- HAVE_IMAGEMAGICK=yes
- AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.])
- CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
- LIBS="$IMAGEMAGICK_LIBS $LIBS"
- fi
- fi
-fi
HAVE_GTK=no
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
@@ -2974,7 +2952,6 @@ 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 imagemagick?
${HAVE_IMAGEMAGICK}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
diff --git a/src/Makefile.in b/src/Makefile.in
index 797d6fb..425cf98 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -253,7 +253,7 @@ DBUS_OBJ = dbusbind.o
/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
since it may have -I options that should override those two. */
-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${IMAGEMAGICK_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@
@FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
+ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@
@M17N_FLT_CFLAGS@
ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
.SUFFIXES: .m
@@ -425,9 +425,6 @@ CFLAGS_SOUND= @CFLAGS_SOUND@
RSVG_LIBS= @RSVG_LIBS@
RSVG_CFLAGS= @RSVG_CFLAGS@
-IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@
-IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
-
#ifndef ORDINARY_LINK
/* Fix linking if compiled with GCC. */
#ifdef __GNUC__
@@ -881,7 +878,7 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \
duplicated symbols. If the standard libraries were compiled
with GCC, we might need gnulib again after them. */
-LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS)
${IMAGEMAGICK_LIBS} $(DBUS_LIBS) \
+LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
LIBS_DEBUG $(GETLOADAVG_LIBS) \
@FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
diff --git a/src/config.in b/src/config.in
index 111de5d..404e00b 100644
--- a/src/config.in
+++ b/src/config.in
@@ -547,9 +547,6 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
/* Define to 1 if using librsvg. */
#undef HAVE_RSVG
-/* Define to 1 if using imagemagick. */
-#undef HAVE_IMAGEMAGICK
-
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
diff --git a/src/image.c b/src/image.c
index 80035cb..fa8c3ea 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7771,281 +7771,6 @@ gif_load (struct frame *f, struct image *img)
#endif /* HAVE_GIF */
-/***********************************************************************
- imagemagick
- ***********************************************************************/
-#if defined (HAVE_IMAGEMAGICK)
-
-/* Function prototypes. */
-
-static int imagemagick_image_p P_ ((Lisp_Object object));
-static int imagemagick_load P_ ((struct frame *f, struct image *img));
-
-static int imagemagick_load_image P_ ((struct frame *, struct image *,
- unsigned char *, unsigned int));
-
-/* The symbol `imagemagick' identifying images of this type. */
-
-Lisp_Object Qimagemagick;
-
-/* Indices of image specification fields in imagemagick_format, below. */
-
-enum imagemagick_keyword_index
-{
- IMAGEMAGICK_TYPE,
- IMAGEMAGICK_DATA,
- IMAGEMAGICK_FILE,
- IMAGEMAGICK_ASCENT,
- IMAGEMAGICK_MARGIN,
- IMAGEMAGICK_RELIEF,
- IMAGEMAGICK_ALGORITHM,
- IMAGEMAGICK_HEURISTIC_MASK,
- IMAGEMAGICK_MASK,
- IMAGEMAGICK_BACKGROUND,
- IMAGEMAGICK_LAST
-};
-
-/* Vector of image_keyword structures describing the format
- of valid user-defined image specifications. */
-
-static struct image_keyword imagemagick_format[IMAGEMAGICK_LAST] =
-{
- {":type", IMAGE_SYMBOL_VALUE, 1},
- {":data", IMAGE_STRING_VALUE, 0},
- {":file", IMAGE_STRING_VALUE, 0},
- {":ascent", IMAGE_ASCENT_VALUE, 0},
- {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
- {":relief", IMAGE_INTEGER_VALUE, 0},
- {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
- {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
- {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
- {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
-};
-
-/* Structure describing the image type `imagemagick'. Its the same type of
- structure defined for all image formats, handled by emacs image
- functions. See struct image_type in dispextern.h. */
-
-static struct image_type imagemagick_type =
-{
- /* An identifier showing that this is an image structure for the IMAGEMAGICK
format. */
- &Qimagemagick,
- /* Handle to a function that can be used to identify a IMAGEMAGICK file. */
- imagemagick_image_p,
- /* Handle to function used to load a IMAGEMAGICK file. */
- imagemagick_load,
- /* Handle to function to free resources for IMAGEMAGICK. */
- x_clear_image,
- /* An internal field to link to the next image type in a list of
- image types, will be filled in when registering the format. */
- NULL
-};
-
-
-/* Return non-zero if OBJECT is a valid IMAGEMAGICK image specification. Do
- this by calling parse_image_spec and supplying the keywords that
- identify the IMAGEMAGICK format. */
-
-static int
-imagemagick_image_p (object)
- Lisp_Object object;
-{
- struct image_keyword fmt[IMAGEMAGICK_LAST];
- bcopy (imagemagick_format, fmt, sizeof fmt);
-
- if (!parse_image_spec (object, fmt, IMAGEMAGICK_LAST, Qimagemagick))
- return 0;
-
- /* Must specify either the :data or :file keyword. */
- return fmt[IMAGEMAGICK_FILE].count + fmt[IMAGEMAGICK_DATA].count == 1;
-}
-
-/* The GIF library also defines DrawRectangle, but its never used in Emacs.
- Therefore renamethe function so it doesnt collide with ImageMagick */
-#define DrawRectangle DrawRectangleGif
-#include <wand/MagickWand.h>
-
-/* Load IMAGEMAGICK image IMG for use on frame F. Value is non-zero if
- successful. this function will go into the imagemagick_type structure, and
- the prototype thus needs to be compatible with that structure. */
-
-static int
-imagemagick_load (f, img)
- struct frame *f;
- struct image *img;
-{
- int success_p = 0;
- Lisp_Object file_name;
-
- /* If IMG->spec specifies a file name, create a non-file spec from it. */
- file_name = image_spec_value (img->spec, QCfile, NULL);
- if (STRINGP (file_name))
- {
- Lisp_Object file;
- unsigned char *contents;
- int size;
- struct gcpro gcpro1;
-
- file = x_find_image_file (file_name);
- GCPRO1 (file);
- if (!STRINGP (file))
- {
- image_error ("Cannot find image file `%s'", file_name, Qnil);
- UNGCPRO;
- return 0;
- }
-
- /* Read the entire file into memory. */
- contents = slurp_file (SDATA (file), &size);
- if (contents == NULL)
- {
- image_error ("Error loading IMAGEMAGICK image `%s'", img->spec, Qnil);
- UNGCPRO;
- return 0;
- }
- /* If the file was slurped into memory properly, parse it. */
- success_p = imagemagick_load_image (f, img, contents, size);
- xfree (contents);
- UNGCPRO;
- }
- /* Else its not a file, its a lisp object. Load the image from a
- lisp object rather than a file. */
- else
- {
- Lisp_Object data;
-
- data = image_spec_value (img->spec, QCdata, NULL);
- success_p = imagemagick_load_image (f, img, SDATA (data), SBYTES (data));
- }
-
- return success_p;
-}
-
-/* imagemagick_load_image is a helper function for imagemagick_load, which
does the
- actual loading given contents and size, apart from frame and image
- structures, passed from imagemagick_load.
-
- Uses librimagemagick to do most of the image processing.
-
- Returns non-zero when successful.
-
-JAVE TODO: almost all imagemagick code will go here
-*/
-
-static int
-imagemagick_load_image (f, img, contents, size)
- /* Pointer to emacs frame structure. */
- struct frame *f;
- /* Pointer to emacs image structure. */
- struct image *img;
- /* String containing the IMAGEMAGICK data to be parsed. */
- unsigned char *contents;
- /* Size of data in bytes. */
- unsigned int size;
-{
- long unsigned int width;
- long unsigned int height;
-
- MagickBooleanType
- status;
-
- XImagePtr ximg;
- Lisp_Object specified_bg;
- XColor background;
- int x;
- int y;
-
- MagickWand *image_wand;
- PixelIterator *iterator;
- PixelWand **pixels;
- MagickPixelPacket pixel;
-
-
- /* MagickWandGenesis() initalizes the imagemagick library */
- MagickWandGenesis();
- /* image_wand will contain the image */
- image_wand=NewMagickWand();
-
- /* Parse the contents argument and fill in the rimagemagick_handle. */
- //status=MagickReadImage(image_wand, "/tmp/tst.djvu");
- status=MagickReadImageBlob(image_wand, contents, size);
- if (status == MagickFalse) goto imagemagick_error;
-
- // status=MagickGetSize(image_wand, &width, &height);
- height=MagickGetImageHeight(image_wand);
- width=MagickGetImageWidth(image_wand);
- if (status == MagickFalse) goto imagemagick_error;
-
- if (! check_image_size (f, width, height))
- {
- image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
- goto imagemagick_error;
- }
-
- /* We can now get a valid pixel buffer from the imagemagick file, if all
- went ok. */
-
-
-
- /* Try to create a x pixmap to hold the imagemagick pixmap. */
- if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
- {
- return 0;
- }
-
- init_color_table ();
-
-
- /* This loop handles opacity values, since Emacs assumes
- non-transparent images. Each pixel must be "flattened" by
- calculating the resulting color, given the transparency of the
- pixel, and the image background color. */
- iterator=NewPixelIterator(image_wand);
- if ((iterator == (PixelIterator *) NULL)) goto imagemagick_error;
-
- for (y=0; y < (long) MagickGetImageHeight(image_wand); y++)
- {
- pixels=PixelGetNextIteratorRow(iterator,&width);
- if ((pixels == (PixelWand **) NULL))
- break;
- for (x=0; x < (long) width; x++)
- {
- PixelGetMagickColor(pixels[x],&pixel);
- XPutPixel (ximg, x, y, lookup_rgb_color (f, pixel.red, pixel.green,
pixel.blue));
- }
- }
-
-#ifdef COLOR_TABLE_SUPPORT
- /* Remember colors allocated for this image. */
- img->colors = colors_in_color_table (&img->ncolors);
- free_color_table ();
-#endif /* COLOR_TABLE_SUPPORT */
-
-
- img->width = width;
- img->height = height;
-
- /* Maybe fill in the background field while we have ximg handy.
- Casting avoids a GCC warning. */
- IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg);
-
- /* Put the image into the pixmap, then free the X image and its
- buffer. */
- x_put_x_image (f, ximg, img->pixmap, width, height);
- x_destroy_x_image (ximg);
-
- //JAVE TODO lots of cleanup
-
- return 1;
-
- imagemagick_error:
- image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil);
- return 0;
-}
-
-#endif /* defined (HAVE_IMAGEMAGICK) */
-
-
/***********************************************************************
SVG
@@ -8843,11 +8568,6 @@ of `image-library-alist', which see). */)
return CHECK_LIB_AVAILABLE (&svg_type, init_svg_functions, libraries);
#endif
-#if defined (HAVE_IMAGEMAGICK)
- if (EQ (type, Qimagemagick))
- return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions,
libraries);
-#endif
-
#ifdef HAVE_GHOSTSCRIPT
if (EQ (type, Qpostscript))
return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries);
@@ -8993,12 +8713,6 @@ non-numeric, there is no explicit limit on the size of
images. */);
ADD_IMAGE_TYPE (Qpng);
#endif
-#if defined (HAVE_IMAGEMAGICK)
- Qimagemagick = intern ("imagemagick");
- staticpro (&Qimagemagick);
- ADD_IMAGE_TYPE (Qimagemagick);
-#endif
-
#if defined (HAVE_RSVG)
Qsvg = intern ("svg");
staticpro (&Qsvg);
--
Joakim Verona
- imagemagick patch v1,
joakim <=