From 27505cf5e4d61283be5368cfd200c942dded0c79 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 9 Jul 2012 06:17:37 -0400
Subject: [PATCH] Auto-commit of generated files.

---
 autogen/Makefile.in |  2 +-
 autogen/config.in   |  7 +++++-
 autogen/configure   | 54 ++++++++++++++-------------------------------
 3 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 151adf424bf..4808d7aa179 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -97,7 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/utimbuf.m4 \
 	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \
 	$(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/autogen/config.in b/autogen/config.in
index aad4c148c6b..bb9c2d5339e 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1,4 +1,4 @@
-/* src/config.in.  Generated from configure.in by autoheader.  */
+/* src/config.in.  Generated from configure.ac by autoheader.  */
 
 /* GNU Emacs site configuration template file.
 
@@ -1089,6 +1089,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define to empty to suppress deprecation warnings when building with
+   --enable-gcc-warnings and with libpng versions before 1.5, which lack
+   png_longjmp. */
+#undef PNG_DEPRECATED
+
 /* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno.
    */
 #undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO
diff --git a/autogen/configure b/autogen/configure
index 13b55b60d8d..7dc2f8cee48 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7606,41 +7606,6 @@ if test "x$gl_cv_warn_c__Wno_format_nonliteral" = x""yes; then :
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-deprecated-declarations" >&5
-$as_echo_n "checking whether C compiler handles -Wno-deprecated-declarations... " >&6; }
-if test "${gl_cv_warn_c__Wno_deprecated_declarations+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wno-deprecated-declarations"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_deprecated_declarations=yes
-else
-  gl_cv_warn_c__Wno_deprecated_declarations=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_deprecated_declarations" >&5
-$as_echo "$gl_cv_warn_c__Wno_deprecated_declarations" >&6; }
-if test "x$gl_cv_warn_c__Wno_deprecated_declarations" = x""yes; then :
-  as_fn_append WARN_CFLAGS " -Wno-deprecated-declarations"
-fi
-
- # triggered by libpng
 
   # In spite of excluding -Wlogical-op above, it is enabled, as of
   # gcc 4.5.0 20090517.
@@ -20235,7 +20200,7 @@ eval as_val=\$$as_ac_Header
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
+ break
 fi
 
 done
@@ -20289,6 +20254,22 @@ fi
 $as_echo "#define HAVE_PNG 1" >>confdefs.h
 
     LIBPNG="-lpng -lz -lm"
+
+    ac_fn_c_check_decl "$LINENO" "png_longjmp" "ac_cv_have_decl_png_longjmp" "#ifdef HAVE_LIBPNG_PNG_H
+	# include <libpng/png.h>
+	#else
+	# include <png.h>
+	#endif
+
+"
+if test "x$ac_cv_have_decl_png_longjmp" = x""yes; then :
+
+else
+
+$as_echo "#define PNG_DEPRECATED /**/" >>confdefs.h
+
+fi
+
   fi
 fi
 
@@ -24807,4 +24788,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
-- 
2.39.2