Hi folks,

Of course I haven't tried all different Linux distros. but
for Debian Etch I have to apply the appended patch to make
detecting "gdk-imlib11" work. "imlib11" (without "gdk-")
does not seem to be necessary. Imlib.h doesn't appear
anywhere in the code, except for acinclude.m4.

Is this patch OK? Could somebody please verify and apply?
Of course the patched fvwm built cleanly (at least on my
Debian box).


Many thanx

Harri
============================================================

Before:

FVWM Configuration:

  Version:     2.5.18 (from cvs)

  Executables: /usr/local/bin
  Man pages:   /usr/local/man
  Modules:     /usr/local/libexec/fvwm/2.5.18
  Data files:  /usr/local/share/fvwm
  Perl lib:    /usr/local/share/fvwm/perllib
  Locale msg:  /usr/local/share/locale  ar de fr sv_SE zh_CN

  With Asian bi-direct. text support? yes
  With Gettext Native Lang support?   yes (libc)
  With GTK+ required for FvwmGtk?     yes
  With GDK image support in FvwmGtk?  no: Failed on gdk-imlib, see config.log
  With GNOME libs support in FvwmGtk? yes
  With Iconv support?                 yes (from C library)
  With Mouse strokes (gestures)?      yes
  With PNG image support?             yes
  With ReadLine sup. in FvwmConsole?  yes
  With RPlay support in FvwmEvent?    yes
  With Shaped window support?         yes
  With Shared memory for XImage?      yes
  With Session Management support?    yes
  With Xinerama multi-head support?   yes
  With Xft anti-alias font support?   yes (version 2)
  With XPM image support?             yes
  With Xrender image support?         yes


After:

FVWM Configuration:

  Version:     2.5.18 (from cvs)

  Executables: /usr/local/bin
  Man pages:   /usr/local/share/man
  Modules:     /usr/local/libexec/fvwm/2.5.18
  Data files:  ${prefix}/share/fvwm
  Perl lib:    ${prefix}/share/fvwm/perllib
  Locale msg:  ${prefix}/share/locale  ar de fr sv_SE zh_CN

  With Asian bi-direct. text support? yes
  With Gettext Native Lang support?   yes (libc)
  With GTK+ required for FvwmGtk?     yes
  With GDK image support in FvwmGtk?  yes
  With GNOME libs support in FvwmGtk? yes
  With Iconv support?                 yes (from C library)
  With Mouse strokes (gestures)?      yes
  With PNG image support?             yes
  With ReadLine sup. in FvwmConsole?  yes
  With RPlay support in FvwmEvent?    yes
  With Shaped window support?         yes
  With Shared memory for XImage?      yes
  With Session Management support?    yes
  With Xinerama multi-head support?   yes
  With Xft anti-alias font support?   yes (version 2)
  With XPM image support?             yes
  With Xrender image support?         yes



Index: acinclude.m4
===================================================================
RCS file: /home/cvs/fvwm/fvwm/acinclude.m4,v
retrieving revision 1.54
diff -u -u -r1.54 acinclude.m4
--- acinclude.m4        2 Mar 2006 11:38:35 -0000       1.54
+++ acinclude.m4        3 Sep 2006 14:25:08 -0000
@@ -589,7 +589,7 @@
       AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
-#include <Imlib.h>
+#include <gdk_imlib.h>
 
 ImlibImage testimage;
 
@@ -648,7 +648,7 @@
           LIBS="$LIBS $IMLIB_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
-#include <Imlib.h>
+#include <gdk_imlib.h>
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually 
means"
           echo "*** that the run-time linker is not finding IMLIB or finding 
the wrong"
@@ -728,7 +728,6 @@
       AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
-#include <Imlib.h>
 #include <gdk_imlib.h>
 
 /* migo: originally it was GdkImLibColor with incorrect spelling */
@@ -794,7 +793,6 @@
           LIBS="$LIBS $GDK_IMLIB_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
-#include <Imlib.h>
 #include <gdk_imlib.h>
 ],      [ return 0; ],
         [                 (echo "*** The test program compiled, but did not 
run. This usually means" >&5) 2>/dev/null || \
Index: ChangeLog
===================================================================
RCS file: /home/cvs/fvwm/fvwm/ChangeLog,v
retrieving revision 1.2756
diff -u -u -r1.2756 ChangeLog
--- ChangeLog   31 Aug 2006 11:36:56 -0000      1.2756
+++ ChangeLog   3 Sep 2006 14:25:31 -0000
@@ -1,3 +1,8 @@
+2006-09-03  Harald Dunkel <[EMAIL PROTECTED]>
+
+       * acinclude.m4:
+         drop obsolete dependency upon Imlib.h
+
 2006-08-31  Dominik Vogt  <dominik(dot)vogt(at)gmx(dot)de>
 
        * fvwm/ewmh.c (atom_get):

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to