[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/korganizer
From:       Josef Spillner <spillner () kde ! org>
Date:       2004-03-31 21:21:55
Message-ID: 20040331212155.0AF9190AB () office ! kde ! org
[Download RAW message or body]

CVS commit by josef: 

- use local knewstuff only, if not found in KDE installation
  do not compile/install local knewstuff otherwise


  M +2 -2      Makefile.am   1.261
  M +38 -0     configure.in.in   1.16


--- kdepim/korganizer/Makefile.am  #1.260:1.261
@@ -1,3 +1,3 @@
-SUBDIRS = knewstuff . korgac pixmaps sounds plugins interfaces
+SUBDIRS = $(KNEWSTUFF_SUBDIR) . korgac pixmaps sounds plugins interfaces
 
 INCLUDES = \
@@ -51,5 +51,5 @@
         libkorganizer_eventviewer.la \
         $(top_builddir)/kdgantt/libkdgantt.la \
-        $(top_builddir)/korganizer/knewstuff/libknewstuff.la \
+        $(KNEWSTUFF_LIB) \
         $(top_builddir)/ktnef/lib/libktnef.la
 libkorganizer_la_COMPILE_FIRST = kofilterview_base.ui \

--- kdepim/korganizer/configure.in.in  #1.15:1.16
@@ -25,4 +25,42 @@
 AC_CHECK_USLEEP
 
+dnl Check for KNewStuff presence (i.e. kdelibs-3.3)
+dnl If not present, use internal knewstuff
+
+AC_DEFUN(KDE_CHECK_KNEWSTUFF,
+[
+AC_MSG_CHECKING([for KDE library: knewstuff])
+ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
+knewstuff_libraries=""
+knewstuff_includes=""
+AC_CACHE_VAL(ac_cv_have_knewstuff,
+[
+AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
+ac_knewstuff_includes="$knewstuff_incdir"
+AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir)
+ac_knewstuff_libraries="$knewstuff_libdir"
+if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
+  ac_cv_have_knewstuff="have_knewstuff=no"
+  ac_knewstuff_notfound=""
+else
+  have_knewstuff="yes"
+fi
+])
+eval "$ac_cv_have_knewstuff"
+if test "$have_knewstuff" != yes; then
+  AC_MSG_RESULT([$have_knewstuff])
+  KNEWSTUFF_SUBDIR='knewstuff'
+  KNEWSTUFF_LIB='$(top_builddir)/korganizer/knewstuff/libknewstuff.la'
+else
+  AC_MSG_RESULT([$have_knewstuff])
+  KNEWSTUFF_SUBDIR=''
+  KNEWSTUFF_LIB='-lknewstuff'
+fi
+AC_SUBST(KNEWSTUFF_SUBDIR)
+AC_SUBST(KNEWSTUFF_LIB)
+])
+
+KDE_CHECK_KNEWSTUFF
+
 dnl AC_OUTPUT(korganizer/ical2vcal)
 


[prev in list] [next in list] [prev in thread] [next in thread]