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

List:       kde-commits
Subject:    branches/trinity/applications/kpilot
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-06-30 21:14:26
Message-ID: 20110630211426.E3976AC7E9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1238887 by tpearson:

Fix kpilot build system


 M  +1 -1      Makefile.am  
 M  +1 -1      conduits/abbrowserconduit/Makefile.am  
 M  +1 -1      conduits/docconduit/Makefile.am  
 M  +1 -1      conduits/knotes/Makefile.am  
 M  +1 -1      conduits/malconduit/Makefile.am  
 M  +1 -1      conduits/memofileconduit/Makefile.am  
 M  +1 -1      conduits/notepadconduit/Makefile.am  
 M  +1 -1      conduits/null/Makefile.am  
 M  +1 -1      conduits/popmail/Makefile.am  
 M  +1 -1      conduits/recordconduit/Makefile.am  
 M  +1 -1      conduits/sysinfoconduit/Makefile.am  
 M  +1 -1      conduits/timeconduit/Makefile.am  
 M  +1 -1      conduits/vcalconduit/Makefile.am  
 M  +31 -0     configure.in.in  
 M  +1 -1      kpilot/Makefile.am  
 M  +1 -1      lib/Makefile.am  


--- branches/trinity/applications/kpilot/Makefile.am #1238886:1238887
@@ -1,4 +1,4 @@
-## kdepim/kpilot/Makefile.am
+## Makefile.am
 ## (C) 1997 Stephan Kulow
 ## Modified by Adriaan de Groot
 
--- branches/trinity/applications/kpilot/conduits/abbrowserconduit/Makefile.am \
#1238886:1238887 @@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 kde_module_LTLIBRARIES = conduit_address.la
 
--- branches/trinity/applications/kpilot/conduits/docconduit/Makefile.am \
#1238886:1238887 @@ -5,7 +5,7 @@
 
 SUBDIRS = Icons
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 
--- branches/trinity/applications/kpilot/conduits/knotes/Makefile.am #1238886:1238887
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/kpilot/lib \
$(all_includes) +INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/lib \
$(all_includes)  
 METASOURCES = AUTO
 
--- branches/trinity/applications/kpilot/conduits/malconduit/Makefile.am \
#1238886:1238887 @@ -3,7 +3,7 @@
 ### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
 
 
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib \
$(all_includes) +INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/lib \
$(all_includes)  METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
--- branches/trinity/applications/kpilot/conduits/memofileconduit/Makefile.am \
#1238886:1238887 @@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
--- branches/trinity/applications/kpilot/conduits/notepadconduit/Makefile.am \
#1238886:1238887 @@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
--- branches/trinity/applications/kpilot/conduits/null/Makefile.am #1238886:1238887
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
--- branches/trinity/applications/kpilot/conduits/popmail/Makefile.am \
#1238886:1238887 @@ -1,7 +1,7 @@
 ### Makefile for the popmail conduit
 ###
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir  = $(kde_servicesdir)
--- branches/trinity/applications/kpilot/conduits/recordconduit/Makefile.am \
#1238886:1238887 @@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
--- branches/trinity/applications/kpilot/conduits/sysinfoconduit/Makefile.am \
#1238886:1238887 @@ -2,7 +2,7 @@
 ###
 ### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
--- branches/trinity/applications/kpilot/conduits/timeconduit/Makefile.am \
#1238886:1238887 @@ -2,7 +2,7 @@
 ###
 ### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
--- branches/trinity/applications/kpilot/conduits/vcalconduit/Makefile.am \
#1238886:1238887 @@ -3,7 +3,7 @@
 ### so it seems logical to put them in one place.
 ###
 
-INCLUDES= -I$(top_srcdir)/kpilot/lib -I$(top_srcdir) \
+INCLUDES= -I$(top_srcdir)/lib -I$(top_srcdir) \
 	$(PISOCK_INCLUDE) $(all_includes)
 
 METASOURCES = AUTO
--- branches/trinity/applications/kpilot/configure.in.in #1238886:1238887
@@ -1,3 +1,34 @@
+#MIN_CONFIG(3.3)
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS(fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h \
values.h sys/limits.h err.h sys/cdefs.h) +
+AC_CHECK_SETENV
+AC_CHECK_UNSETENV
+
+KDE_NEED_FLEX
+
+if test "$x_includes" != "NONE"; then
+  AC_DEFINE(HAVE_X11_HEADERS,1,Define if you have X11 header files)
+fi
+AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, [LIBXTST=-lXtst],, -lX11)
+AC_SUBST(LIBXTST)
+if test "$LIBXTST" != ""; then
+  AC_CHECK_HEADER([X11/extensions/XTest.h],
+                  [AC_DEFINE(HAVE_XTEST, 1, [Define if you have X11 Xtest header \
files])]) +fi
+
+KDE_INIT_DOXYGEN([KDE PIM API Reference], [Version $VERSION])
+
+KDE_CHECK_THREADING
+
+dnl For apps that NEED threads
+if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then
+  DO_NOT_COMPILE="$DO_NOT_COMPILE knode"
+fi
+
+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+
 dnl Configure.in.in for KPilot.
 dnl
 dnl Copyright (C) 2000,2001 Adriaan de Groot
--- branches/trinity/applications/kpilot/kpilot/Makefile.am #1238886:1238887
@@ -15,7 +15,7 @@
 
 METASOURCES = AUTO
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc
 libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries)
--- branches/trinity/applications/kpilot/lib/Makefile.am #1238886:1238887
@@ -29,7 +29,7 @@
 	pilotTodoEntry.cc
 
 libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) \
                $(KDE_EXTRA_RPATH) $(KDE_RPATH)
-libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) \
$(top_builddir)/libkcal/libkcal.la +libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) \
$(LIB_KABC) -lkcal  
 kpilotincludedir = $(includedir)/kpilot
 kpilotinclude_HEADERS = \


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