------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=138616
caulier.gilles kdemail net changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution| |FIXED
------- Additional Comments From caulier.gilles kdemail net 2006-12-15 16:32 -------
SVN commit 613892 by cgilles:
digikam from trunk : patch about Exiv2 0.12 version detection from Angelo.
BUG: 138616
M +2 -10 configure.in.in
M +1 -1 digikam/Makefile.am
M +3 -3 kioslave/Makefile.am
M +1 -1 showfoto/Makefile.am
--- trunk/extragear/graphics/digikam/configure.in.in #613891:613892
@ -215,19 +215,11 @
#------------------------------------------------------------------
have_exiv2='no'
-AC_PATH_PROG(EXIV2_CONFIG,exiv2-config)
-if test -n "${EXIV2_CONFIG}"; then
- EXIV2_CFLAGS="`$EXIV2_CONFIG --cflags`"
- AC_SUBST(EXIV2_CFLAGS)
- LIB_EXIV2="`$EXIV2_CONFIG --libs`"
- AC_SUBST(LIB_EXIV2)
- KDE_PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.12, have_exiv2=yes,have_exiv2=no)
+if test "$PKGCONFIGFOUND" = "yes" ; then
+ KDE_PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.12, have_exiv2=yes,have_exiv2=no)
fi
if test "x$have_exiv2" != "xyes"; then
- if test -n "${EXIV2_CONFIG}"; then
- AC_MSG_RESULT($have_exiv2)
- fi
AC_MSG_WARN([Exiv2 library not found, digiKam will not be compiled.])
DO_NOT_COMPILE="digikam digikamimageplugins $DO_NOT_COMPILE"
fi
--- trunk/extragear/graphics/digikam/digikam/Makefile.am #613891:613892
@ -91,7 +91,7 @
upgradedb_sqlite2tosqlite3.cpp
libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) \
- $(LIBKIPI_LIBS) $(LIB_KUTILS) $(LIB_EXIV2) \
+ $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) \
$(top_builddir)/digikam/sqlite/libsqlite.la \
$(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
$(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
--- trunk/extragear/graphics/digikam/kioslave/Makefile.am #613891:613892
@ -21,7 +21,7 @
kio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp
-kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) $(LIB_EXIV2) \
+kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) $(EXIV2_LIBS) \
$(top_builddir)/digikam/libs/dimg/libdimg.la
kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
@ -30,7 +30,7 @
kio_digikampreview_la_SOURCES = digikampreview.cpp
-kio_digikampreview_la_LIBADD = $(LIB_KIO) $(LIB_EXIV2) \
+kio_digikampreview_la_LIBADD = $(LIB_KIO) $(EXIV2_LIBS) \
$(top_builddir)/digikam/libs/dimg/libdimg.la
kio_digikampreview_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
@ -48,7 +48,7 @
kio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp
kio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
- $(LIB_KIO) $(LIB_SQLITE3) $(LIB_EXIV2) \
+ $(LIB_KIO) $(LIB_SQLITE3) $(EXIV2_LIBS) \
$(top_builddir)/digikam/libs/dimg/libdimg.la
kio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
--- trunk/extragear/graphics/digikam/showfoto/Makefile.am #613891:613892
@ -32,7 +32,7 @
$(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
$(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
- $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2)
+ $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(EXIV2_LIBS)
showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Locked
attachment0 (196 bytes)