[libexif-cvs] exif ChangeLog,1.34,1.35 configure.in,1.28,1.29

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

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

Modified Files:
	ChangeLog configure.in 
Log Message:

2004-04-04  Lutz Mueller lu...@us...

	* configure.in: libmnote is no longer separate from libexif.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	7 Jan 2004 23:38:07 -0000	1.34
+++ ChangeLog	4 Apr 2004 08:45:43 -0000	1.35
@@ -1,3 +1,7 @@
+2004-04-04  Lutz Mueller lu...@us...
+
+	* configure.in: libmnote is no longer separate from libexif.
+
 2004-01-08  Lutz Mueller <lu...@us...>
 
 	* exif/actions.c: Adapt to new API

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- configure.in	10 Jan 2004 21:08:59 -0000	1.28
+++ configure.in	4 Apr 2004 08:45:43 -0000	1.29
@@ -23,25 +23,6 @@
 AC_SUBST(LIBEXIF_CFLAGS)
 
 dnl ---------------------------------------------------------------------------
-dnl libmnote: Useful for parsing MakerNote-tags.
-dnl ---------------------------------------------------------------------------
-mnote_msg=no
-try_mnote=true
-AC_ARG_WITH(mnote, [  --without-mnote           Don't use libmnote],
-	if test x$withval = xno; then
-		try_mnote=false
-	fi)
-if $try_mnote; then
-	if ${PKG_CONFIG} --exists libmnote > /dev/null 2>&1; then
-		PKG_CHECK_MODULES(LIBMNOTE, libmnote >= 0.5.6)
-		AC_DEFINE(HAVE_MNOTE,1,[whether we have mnote])
-		AC_SUBST(LIBMNOTE_LIBS)
-		AC_SUBST(LIBMNOTE_CFLAGS)
-		mnote_msg="yes"
-	fi
-fi
-
-dnl ---------------------------------------------------------------------------
 dnl locale.h: locale.h provides setlocale. It seems that some systems don't
 dnl           have it (at least if configured --without-nls).
 dnl ---------------------------------------------------------------------------
@@ -99,7 +80,7 @@
     AC_SUBST(CFLAGS)
 fi
 
-AC_OUTPUT([
+AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile 
   Makefile
   exif.spec
   libjpeg/Makefile
@@ -112,6 +93,4 @@
 
 	Source code location:      ${srcdir}
 	Compiler:                  ${CC}
-
-	Support for MakerNotes:    $mnote_msg
 "