[Emacs-diffs] pdumper 0c9029d 5/6: Merge remote-tracking branch 'origin/master' into pdumper3

[Daniel Colascione]

branch: pdumper
commit 0c9029d715af129c6d8f6f5b32b57bbbd450c42e
Merge: 992c4e2 b3f4514
Author: Daniel Colascione <address@hidden>
Commit: Daniel Colascione <address@hidden>

    Merge remote-tracking branch 'origin/master' into pdumper3
---
 configure.ac |  7 +------
 src/.gdbinit | 13 ++++++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4b1b29e..2b5f050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3646,11 +3646,7 @@ elif test "${with_png}" != no; then
   if test "$opsys" = mingw32; then
     AC_CHECK_HEADER([png.h], [HAVE_PNG=yes])
   elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
-   EMACS_CHECK_MODULES([PNG], [libpng >= 1.0.0])
-   if test $HAVE_PNG = no; then
-    # Test old way in case pkg-config doesn't have it (older machines).
-    AC_MSG_CHECKING([for libpng not configured by pkg-config])
-
+    AC_MSG_CHECKING([for png])
     png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` &&
     png_ldflags=`(libpng-config --ldflags) 2>&AS_MESSAGE_LOG_FD` || {
       # libpng-config does not work; configure by hand.
@@ -3683,7 +3679,6 @@ elif test "${with_png}" != no; then
     CFLAGS=$SAVE_CFLAGS
     LIBS=$SAVE_LIBS
     AC_MSG_RESULT([$HAVE_PNG])
-   fi
   fi
 fi
 if test $HAVE_PNG = yes; then
diff --git a/src/.gdbinit b/src/.gdbinit
index a5411e6..9fdcaf8 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -819,6 +819,7 @@ define xcompiled
   xgetptr $
   print (struct Lisp_Vector *) $ptr
   output ($->contents[0])@($->header.size & 0xff)
+  echo \n
 end
 document xcompiled
 Print $ as a compiled function pointer.
@@ -1270,6 +1271,12 @@ end
 
 python
 
+# Python 3 compatibility.
+try:
+  long
+except:
+  long = int
+
 # Omit pretty-printing in older (pre-7.3) GDBs that lack it.
 if hasattr(gdb, 'printing'):
 
@@ -1306,13 +1313,13 @@ if hasattr(gdb, 'printing'):
       # symbol table, guess reasonable defaults.
       sym = gdb.lookup_symbol ("EMACS_INT_WIDTH")[0]
       if sym:
-        EMACS_INT_WIDTH = int (sym.value ())
+        EMACS_INT_WIDTH = long (sym.value ())
       else:
         sym = gdb.lookup_symbol ("EMACS_INT")[0]
         EMACS_INT_WIDTH = 8 * sym.type.sizeof
       sym = gdb.lookup_symbol ("USE_LSB_TAG")[0]
       if sym:
-        USE_LSB_TAG = int (sym.value ())
+        USE_LSB_TAG = long (sym.value ())
       else:
         USE_LSB_TAG = 1
 
@@ -1334,7 +1341,7 @@ if hasattr(gdb, 'printing'):
       # integer.  Also, val.cast (gdb.lookup.type ("EMACS_UINT"))
       # would have problems with GDB 7.12.1; see
       # <http://patchwork.sourceware.org/patch/11557/>.
-      ival = int (val)
+      ival = long (val)
 
       # For nil, yield "XIL(0)", which is easier to read than "XIL(0x0)".
       if not ival: