[Kde-imaging] extragear/libs/kipi-plugins

[Seb Ruiz]

SVN commit 626678 by seb:

Since libgpod 0.4.2 has been released, I've re-enabled the ipod export plugin. I've also returned home so i can resume maintaining the plugin.
Now, now more problems with API breakages since we rely on a stable release.

RFC, please!

CCMAIL: kde-imaging at kde.org


 M  +1 -1      Makefile.am  
 M  +2 -3      configure.in.bot  
 M  +9 -22     configure.in.in  


--- trunk/extragear/libs/kipi-plugins/Makefile.am #626677:626678
@@ -21,7 +21,7 @@
 endif
 
 if compile_IPODEXPORT
-#IPODEXPORTDIR = ipodexport
+IPODEXPORTDIR = ipodexport
 endif
 
 SUBDIRS = common printwizard calendar mpegencoder cdarchiving simpleviewerexport \
--- trunk/extragear/libs/kipi-plugins/configure.in.bot #626677:626678
@@ -86,16 +86,15 @@
 fi
 
 if test "x$have_libgpod" != "xyes"; then
-  echo "-- libgpod > 0.4.0 found............ NO"
+  echo "-- libgpod found.................. NO"
   echo ""
-  echo "iPodExport plugin needs the libgpod library, version > 0.4.0. This plugin will not be compiled!"
+  echo "iPodExport plugin needs the libgpod library, version 0.4.2. This plugin will not be compiled!"
   echo "To complile this plugin, please install libgpod development package."
   echo "libgpod website is at http://gtkpod.org/libgpod.html"
   echo ""
   all_tests=bad
 else
   echo "-- libgpod found.................. YES"
-  echo "WARNING: iPodExport plugin has been disabled by kipi team because it has not been tested enough."
 fi
 
 
--- trunk/extragear/libs/kipi-plugins/configure.in.in #626677:626678
@@ -152,33 +152,20 @@
 if test "$build_libgpod" != "no"; then
     if test "$PKGCONFIGFOUND" = "yes" ; then
 
-        KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 > 0.4.0, have_libgpod=yes,have_libgpod=no)
+        KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 = 0.4.2, have_libgpod=yes,have_libgpod=no)
 
         if test "x$have_libgpod" = "xyes"; then
-        AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod])
-        ac_cppflags_save=$CPPFLAGS
-        ac_cflags_save=$CFLAGS
-        ac_ldflags_save=$LDFLAGS
+            AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod])
+            ac_cppflags_save=$CPPFLAGS
+            ac_cflags_save=$CFLAGS
+            ac_ldflags_save=$LDFLAGS
 
-        CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES"
-        CFLAGS="$CFLAGS $LIBGPOD_CFLAGS"
-        LDFLAGS="$LDFLAGS $LIBGPOD_LIBS"
-
-        AC_CHECK_FUNCS(itdb_photodb_photoalbum_create, have_libgpod_photos=yes)
-        AC_CHECK_FUNCS(itdb_photodb_parse)
-        AC_CHECK_FUNCS(itdb_device_get_ipod_info)
-
-        if test "x$have_libgpod_photos" = "xno"; then
-            AC_MSG_WARN([ Current version of libgpod does not support the photo database. You need a CVS (development) version.])
-            have_libgpod=no
+            CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES"
+            CFLAGS="$CFLAGS $LIBGPOD_CFLAGS"
+            LDFLAGS="$LDFLAGS $LIBGPOD_LIBS"
         else
-            CPPFLAGS=$ac_cppflags_save
-            CFLAGS=$ac_cflags_save
-            LDFLAGS=$ac_ldflags_save
+            AC_MSG_WARN([libgpod is required for the iPod export plugin.])
         fi
-        else
-          AC_MSG_WARN([libgpod is required for the iPod export plugin.])
-        fi
     fi
 fi