diff --git a/autogen/config.in b/autogen/config.in
index bb9c2d5339e..99c67c05d95 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -66,6 +66,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if using 'alloca.c'. */
 #undef C_ALLOCA
 
+/* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */
+#undef DATA_SEG_BITS
+
+/* Address of the start of the data segment. */
+#undef DATA_START
+
 /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
 #undef DGUX
 
@@ -1089,10 +1095,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Number of chars of output in the buffer of a stdio stream. */
+#undef PENDING_OUTPUT_COUNT
+
 /* 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
+#undef PNG_DEPSTRUCT
 
 /* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno.
    */
@@ -1501,6 +1510,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
 #endif
 
+#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
+
 /* Some versions of GNU/Linux define noinline in their headers.  */
 #ifdef noinline
 #undef noinline
diff --git a/autogen/configure b/autogen/configure
index 7dc2f8cee48..875ef806318 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7161,7 +7161,6 @@ fi
   # The following lines should be removable at some point.
   nw="$nw -Wstack-protector"
   nw="$nw -Wstrict-overflow"
-  nw="$nw -Wsuggest-attribute=const"
   nw="$nw -Wsuggest-attribute=pure"
 
 
@@ -20266,7 +20265,7 @@ if test "x$ac_cv_have_decl_png_longjmp" = x""yes; then :
 
 else
 
-$as_echo "#define PNG_DEPRECATED /**/" >>confdefs.h
+$as_echo "#define PNG_DEPSTRUCT /**/" >>confdefs.h
 
 fi
 
@@ -22661,6 +22660,41 @@ $as_echo "#define HAVE_PROCFS 1" >>confdefs.h
   ;;
 esac
 
+
+
+
+
+
+case $opsys in
+  cygwin | darwin | freebsd | netbsd | openbsd )
+    $as_echo "#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)" >>confdefs.h
+
+    ;;
+
+  unixware)
+    $as_echo "#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)" >>confdefs.h
+
+    ;;
+
+  gnu)
+        $as_echo "#define DATA_START ({ extern int data_start; (char *) &data_start; })" >>confdefs.h
+
+    ;;
+
+  hpux*)
+        $as_echo "#define DATA_START 0x40000000" >>confdefs.h
+
+    $as_echo "#define DATA_SEG_BITS 0x40000000" >>confdefs.h
+
+    ;;
+  irix6-5)
+    $as_echo "#define DATA_START 0x10000000" >>confdefs.h
+
+    $as_echo "#define DATA_SEG_BITS 0x10000000" >>confdefs.h
+
+    ;;
+esac
+
 case $opsys in
    gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;