From 7a67e06b99a85ae700a7ccc75468397d53af59ed Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 12 Aug 2013 06:17:43 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/Makefile.in | 2 + autogen/config.in | 10 +-- autogen/configure | 144 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 128 insertions(+), 28 deletions(-) diff --git a/autogen/Makefile.in b/autogen/Makefile.in index af3dbeaf264..2122ca2d169 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -903,6 +903,7 @@ LIBXSM = @LIBXSM@ LIBXTR6 = @LIBXTR6@ LIBXT_OTHER = @LIBXT_OTHER@ LIBX_OTHER = @LIBX_OTHER@ +LIBZ = @LIBZ@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_EACCESS = @LIB_EACCESS@ @@ -1185,6 +1186,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ etcdir = @etcdir@ +etcdocdir = @etcdocdir@ exec_prefix = @exec_prefix@ gamedir = @gamedir@ gameuser = @gameuser@ diff --git a/autogen/config.in b/autogen/config.in index b996a5f071e..00b7c5ba05e 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -408,10 +408,6 @@ along with GNU Emacs. If not, see . */ don't. */ #undef HAVE_DECL__PUTENV -/* Define to 1 if you have the declaration of `__fpending', and to 0 if you - don't. */ -#undef HAVE_DECL___FPENDING - /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you don't. */ #undef HAVE_DECL___SYS_SIGLIST @@ -1190,6 +1186,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you want to use the X window system. */ #undef HAVE_X_WINDOWS +/* Define to 1 if you have the zlib library (-lz). */ +#undef HAVE_ZLIB + /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL @@ -1205,9 +1204,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `__executable_start' function. */ #undef HAVE___EXECUTABLE_START -/* Define to 1 if you have the `__fpending' function. */ -#undef HAVE___FPENDING - /* Define to 1 if you have the `__secure_getenv' function. */ #undef HAVE___SECURE_GETENV diff --git a/autogen/configure b/autogen/configure index c319167fc51..54e8f290293 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1279,6 +1279,7 @@ LD_SWITCH_X_SITE gameuser gamedir bitmapdir +etcdocdir archlibdir etcdir x_default_search_path @@ -1315,6 +1316,7 @@ LIBXSM LIBGPM LIBGIF LIBTIFF +LIBZ LIBPNG LIBJPEG LIBXPM @@ -1538,6 +1540,7 @@ with_gconf with_gsettings with_selinux with_gnutls +with_zlib with_file_notification with_makeinfo with_compress_info @@ -2268,6 +2271,7 @@ Optional Packages: --without-gsettings don't compile with GSettings support --without-selinux don't compile with SELinux support --without-gnutls don't use -lgnutls for SSL/TLS support + --without-zlib don't compile with zlib decompression support --with-file-notification=LIB use a file notification library (LIB one of: yes, gfile, inotify, w32, no) @@ -3383,7 +3387,6 @@ as_fn_append ac_func_list " faccessat" as_fn_append ac_func_list " fcntl" as_fn_append ac_func_list " fdopendir" as_fn_append ac_header_list " stdio_ext.h" -as_fn_append ac_func_list " __fpending" as_fn_append ac_func_list " fstatat" as_fn_append ac_func_list " fsync" gl_getopt_required=GNU @@ -4010,7 +4013,7 @@ locallisppath='${datadir}/emacs/${version}/site-lisp:'\ lisppath='${locallisppath}:${standardlisppath}' etcdir='${datadir}/emacs/${version}/etc' archlibdir='${libexecdir}/emacs/${version}/${configuration}' -docdir='${datadir}/emacs/${version}/etc' +etcdocdir='${datadir}/emacs/${version}/etc' gamedir='${localstatedir}/games/emacs' @@ -4356,6 +4359,14 @@ else fi +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; +else + with_zlib=$with_features +fi + + # Check whether --with-file-notification was given. if test "${with_file_notification+set}" = set; then : @@ -10056,7 +10067,7 @@ if test "${HAVE_NS}" = yes; then exec_prefix=${ns_appbindir} libexecdir="\${ns_appbindir}/libexec" archlibdir="\${ns_appbindir}/libexec" - docdir="\${ns_appresdir}/etc" + etcdocdir="\${ns_appresdir}/etc" etcdir="\${ns_appresdir}/etc" infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" @@ -13626,6 +13637,85 @@ fi fi +HAVE_ZLIB=no +LIBZ= +if test "${with_zlib}" != "no"; then + if test "${HAVE_PNG}" = "yes"; then + ### PNG depends on zlib, so if we have PNG, we have zlib. + HAVE_ZLIB=yes + else + ### No PNG, so check zlib ourselves. + OLIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5 +$as_echo_n "checking for library containing inflateEnd... " >&6; } +if test "${ac_cv_search_inflateEnd+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char inflateEnd (); +int +main () +{ +return inflateEnd (); + ; + return 0; +} +_ACEOF +for ac_lib in '' z; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_inflateEnd=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_inflateEnd+set}" = set; then : + break +fi +done +if test "${ac_cv_search_inflateEnd+set}" = set; then : + +else + ac_cv_search_inflateEnd=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflateEnd" >&5 +$as_echo "$ac_cv_search_inflateEnd" >&6; } +ac_res=$ac_cv_search_inflateEnd +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + HAVE_ZLIB=yes +fi + + LIBS=$OLIBS + case $ac_cv_search_inflateEnd in + -*) LIBZ=$ac_cv_search_inflateEnd ;; + esac + fi +fi +if test "${HAVE_ZLIB}" = "yes"; then + +$as_echo "#define HAVE_ZLIB 1" >>confdefs.h + +fi + + + ### Use -ltiff if available, unless `--with-tiff=no'. ### mingw32 doesn't use -ltiff, since it loads the library dynamically. HAVE_TIFF=no @@ -18525,8 +18615,6 @@ _ACEOF - - GNULIB_FCHMODAT=0; GNULIB_FSTAT=0; GNULIB_FSTATAT=0; @@ -22967,27 +23055,40 @@ _ACEOF - - fp_headers=' -# include -# if HAVE_STDIO_EXT_H -# include -# endif -' - ac_fn_c_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers -" -if test "x$ac_cv_have_decl___fpending" = x""yes; then : - ac_have_decl=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpending" >&5 +$as_echo_n "checking for __fpending... " >&6; } +if test "${gl_cv_func___fpending+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_have_decl=0 -fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL___FPENDING $ac_have_decl + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #if HAVE_STDIO_EXT_H + # include + #endif + +int +main () +{ +return ! __fpending (stdin); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func___fpending=yes +else + gl_cv_func___fpending=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func___fpending" >&5 +$as_echo "$gl_cv_func___fpending" >&6; } - if test $ac_cv_func___fpending = no; then + if test $gl_cv_func___fpending = no; then @@ -28869,6 +28970,7 @@ echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE} echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}" echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" echo " Does Emacs use -lxft? ${HAVE_XFT}" +echo " Does Emacs directly use zlib? ${HAVE_ZLIB}" echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo -- 2.39.2