Thu Dec 22 18:29:54 2005 Michael Jennings (mej)

Fixed auto-detection of Imlib2.  :-(
----------------------------------------------------------------------


SVN revision: 19250

4 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index d332b1e..384c8ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -754,3 +754,7 @@ Thu Sep  1 02:20:29 2005                        Michael Jennings (mej)
 
 Additional quoting for libast.m4.
 ----------------------------------------------------------------------
+Thu Dec 22 18:29:54 2005                        Michael Jennings (mej)
+
+Fixed auto-detection of Imlib2.  :-(
+----------------------------------------------------------------------
diff --git a/libast.m4 b/libast.m4
index e3c652c..19c1ae6 100644
--- a/libast.m4
+++ b/libast.m4
@@ -202,6 +202,8 @@ AC_DEFUN([AST_IMLIB2_SUPPORT], [
             if test "x$IMLIB2_CONFIG" != "x"; then
                 GRLIBS="`$IMLIB2_CONFIG --libs`"
                 CFLAGS="$CFLAGS `$IMLIB2_CONFIG --cflags`"
+                AC_DEFINE([LIBAST_IMLIB2_SUPPORT], [1], [Define for Imlib2 support.])
+                LIBAST_IMLIB2_SUPPORT="Imlib2"
             else
                 AC_CHECK_LIB(m, pow, LIBS="-lm $LIBS")
                 AC_CHECK_LIB(dl, dlopen, LIBS="-ldl $LIBS")
diff --git a/libast.spec b/libast.spec
index db2028e..f66501a 100644
--- a/libast.spec
+++ b/libast.spec
@@ -1,6 +1,6 @@
 %define __os_install_post /usr/lib/rpm/brp-compress
 %if %{?optflags:1}0
-%define optflags ${RPM_OPT_FLAGS}
+%define optflags ${RPM_OPT_FLAGS:--O0 -g3}
 %endif
 
 Summary: Library of Assorted Spiffy Things
@@ -28,7 +28,6 @@ version number that begins with 0.
 %setup -q
 
 %build
-#CFLAGS="-O0 -g3"
 CFLAGS="%{optflags}"
 export CFLAGS
 
diff --git a/src/mem.c b/src/mem.c
index ad12fc3..23fbdb4 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -645,9 +645,8 @@ spifmem_x_create_pixmap(const spif_charptr_t filename, unsigned long line, Displ
 {
     Pixmap p;
 
-    D_MEM(("Creating %ux%u pixmap of depth %u for window 0x%08x at %s:%lu\n", w, h, depth, win, NONULL(filename), line));
-
     p = XCreatePixmap(d, win, w, h, depth);
+    D_MEM(("Created %ux%u pixmap 0x%08x of depth %u for window 0x%08x at %s:%lu\n", w, h, p, depth, win, NONULL(filename), line));
     ASSERT_RVAL(p != None, None);
     if (DEBUG_LEVEL >= DEBUG_MEM) {
         memrec_add_var(&pixmap_rec, SPIF_CAST(charptr) NONULL(filename), line, (void *) p, w * h * (depth / 8));