[Kde-imaging] kdeextragear-libs-1

[Renchi Raju]

CVS commit by pahlibar: 


* pkg-configified libkipi
* kipi-plugins configure.in.in updated to include tests for externally 
  installed libkipi
CCMAIL: kde-imaging at kde.org


  A            libkipi/libkipi.pc.in   1.1
  M +7 -0      kipi-plugins/configure.in.bot   1.3
  M +33 -10    kipi-plugins/configure.in.in   1.15
  M +1 -0      libkipi/.cvsignore   1.3
  M +4 -0      libkipi/Makefile.am   1.6
  M +1 -0      libkipi/configure.in.in   1.5


--- kdeextragear-libs-1/kipi-plugins/configure.in.bot  #1.2:1.3
@@ -5,2 +5,9 @@
   all_tests=bad
 fi
+
+if test "x$have_libkipi" != "xyes"; then
+  echo ""
+  echo "You're missing libkipi. kipi-plugins will not be compiled."
+  echo ""
+  all_tests=bad
+fi

--- kdeextragear-libs-1/kipi-plugins/configure.in.in  #1.14:1.15
@@ -65,19 +65,42 @@
 #
 # ----------------------------------------------------------
-AC_MSG_CHECKING([for libkipi in our sources])
+
 if test -d $srcdir/libkipi; then
+    AC_MSG_CHECKING([for libkipi in our sources])
     LIBKIPI_CFLAGS='-I$(top_srcdir)/libkipi/libkipi'
     LIBKIPI_LIBS='$(top_builddir)/libkipi/libkipi/libkipi.la'
     LIBKIPI_LIBS_DEP='$(LIBKIPI_LIBS)'
     AC_MSG_RESULT([found])
+    AC_SUBST(LIBKIPI_CFLAGS)
+    AC_SUBST(LIBKIPI_LIBS)
+    AC_SUBST(LIBKIPI_LIBS_DEP)
 else
-    # FIXME: Write a real test
-    LIBKIPI_CFLAGS=''
-    LIBKIPI_LIBS='-lkipi'
-    AC_MSG_RESULT([not found])
+
+    if test "$PKGCONFIGFOUND" = "yes" ; then
+        # check for libkipi
+        have_libkipi=no
+
+        KDE_PKG_CHECK_MODULES(LIBKIPI, libkipi >= 0.1,
+                have_libkipi=yes, have_libkipi=no)
+
+        if test "x$have_libkipi" = "xno"; then
+           LIBKIPI_CFLAGS=""
+           LIBKIPI_LIBS=""
+           AC_MSG_RESULT([not found])
+        else
+           AC_MSG_RESULT([found])
+        fi
+     else
+        LIBKIPI_CFLAGS=""
+        LIBKIPI_LIBS=""
+        AC_MSG_RESULT([not found])
+     fi 
+     AC_SUBST(LIBKIPI_CFLAGS)
+     AC_SUBST(LIBKIPI_LIBS)
+fi
+
+if test "x$have_libkipi" != "xyes"; then
+     DO_NOT_COMPILE="$DO_NOT_COMPILE kipi-plugins"
 fi
-AC_SUBST(LIBKIPI_CFLAGS)
-AC_SUBST(LIBKIPI_LIBS)
-AC_SUBST(LIBKIPI_LIBS_DEP)
 
 # --------------------------------------------------------------------
@@ -122,5 +145,5 @@
 if test x$have_libkexif != xyes; then
    AC_MSG_RESULT(
-        [libkexif not installded. disabling jpeglossless plugin])
+        [libkexif not installed. disabling jpeglossless plugin])
 fi
 

--- kdeextragear-libs-1/libkipi/.cvsignore  #1.2:1.3
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+libkipi.pc

--- kdeextragear-libs-1/libkipi/Makefile.am  #1.5:1.6
@@ -1 +1,5 @@
 SUBDIRS = libkipi
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libkipi.pc
+EXTRA_DIST = libkipi.pc.in