From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 9 Jul 2012 13:40:34 +0000 (+0200)
Subject: nt/config.nt: Sync with autogen/config.in.
X-Git-Tag: emacs-24.2.90~1199^2~119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5eabd6f00141c39b276616f86c198dbf5ba86125;p=emacs.git

nt/config.nt: Sync with autogen/config.in.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8b2d9ad1b1d..d2bbe4944fd 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* config.nt: Sync with autogen/config.in.
+
 2012-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
 	* config.nt (HAVE_STRCASECMP, HAVE_STRNCASECMP): Remove.
diff --git a/nt/config.nt b/nt/config.nt
index 3dd6d8a822b..96d303078a5 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1097,6 +1097,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