[libexif-cvs] libexif-gtk ChangeLog,1.19,1.20 configure.in,1.20,1.21

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif-gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6709

Modified Files:
	ChangeLog configure.in 
Log Message:

2004-10-18  Lutz Mueller <lu...@us...>

	* configure.in: We are now working on 0.3.6.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog	17 Oct 2004 15:35:32 -0000	1.19
+++ ChangeLog	18 Oct 2004 19:20:03 -0000	1.20
@@ -1,3 +1,14 @@
+2004-10-18  Lutz Mueller <lu...@us...>
+
+	* configure.in: We are now working on 0.3.6.
+
+2004-10-18  Lutz Mueller <lu...@us...>
+
+	* libexif-gtk/gtk-exif-entry-generic.c:
+	* libexif-gtk/gtk-exif-content-list.c:
+	* configure.in: Make libexif-gtk work with versions < 0.6.12. We
+	  are now working on 0.3.5.
+
 2004-10-17  Lutz Mueller <lu...@us...>
 
 	* configure.in: We have been working on 0.3.4 all the time.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.in	17 Oct 2004 15:35:32 -0000	1.20
+++ configure.in	18 Oct 2004 19:20:03 -0000	1.21
@@ -1,6 +1,6 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif-gtk/gtk-exif-browser.c)
-AM_INIT_AUTOMAKE(libexif-gtk, 0.3.4)
+AM_INIT_AUTOMAKE(libexif-gtk, 0.3.6)
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS(config.h)
 
@@ -46,6 +46,18 @@
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
+dnl ---------------------------------------------------------------------------
+dnl There are still some old version of libexif around. For now, don't force
+dnl users to upgrade
+dnl ---------------------------------------------------------------------------
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS=$LIBEXIF_GTK_CFLAGS
+AC_CHECK_HEADER([exif-mem.h], [
+	exif_msg=">= 0.6.12"
+	AC_DEFINE(HAVE_EXIF_0_6_12,1,[whether we use a version of libexif greater than 0.6.12])],[
+	exif_msg="< 0.6.12 (think about upgrading)"])
+CPPFLAGS="$CPPFLAGS_save"
+
 CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
 AC_SUBST(CFLAGS)
 
@@ -56,3 +68,15 @@
   gtk-extensions/Makefile
   tests/Makefile
 ])
+
+echo "
+
+Configuration (${PACKAGE}):
+
+	Source code location:    $(srcdir)
+	Version:                 ${VERSION}
+	Compiler:                ${CC}
+
+	libexif:                 ${exif_msg}
+
+"