Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv9211
Modified Files:
ChangeLog configure.in
Log Message:
2002-11-15 Lutz Müller <lu...@us...>
* configure.in: Ok, I got the message. Let exif _optionally_ use
libmnote if available.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog 15 Nov 2002 19:59:52 -0000 1.23
+++ ChangeLog 15 Nov 2002 21:32:19 -0000 1.24
@@ -1,5 +1,10 @@
2002-11-15 Lutz Müller <lu...@us...>
+ * configure.in: Ok, I got the message. Let exif _optionally_ use
+ libmnote if available.
+
+2002-11-15 Lutz Müller <lu...@us...>
+
* configure.in: Make exif depend on libmnote. This library isn't used
yet, but that's subject to change.
Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.in 15 Nov 2002 19:59:53 -0000 1.16
+++ configure.in 15 Nov 2002 21:32:19 -0000 1.17
@@ -5,6 +5,7 @@
AM_MAINTAINER_MODE
AM_PROG_LIBTOOL
+AC_PATH_PROG(PKG_CONFIG,pkg-config)
dnl ---------------------------------------------------------------------------
dnl i18n support
@@ -15,11 +16,30 @@
dnl ---------------------------------------------------------------------------
dnl libraries needed
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4 libmnote)
+PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4)
AC_SUBST(LIBEXIF_LIBS)
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
+ LIBMNOTE_LIBS=`$PKG_CONFIG --libs libmnote`
+ LIBMNOTE_CFLAGS=`$PKG_CONFIG --cflags libmnote`
+ AC_SUBST(LIBMNOTE_CFLAGS)
+ AC_SUBST(LIBMNOTE_LIBS)
+ 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 ---------------------------------------------------------------------------
@@ -89,4 +109,6 @@
Source code location: ${srcdir}
Compiler: ${CC}
+
+ Support for MakerNotes: $mnote_msg
"
|
