summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-04-05 09:13:26 -0500
committerTimothy Pearson <[email protected]>2013-04-05 09:13:26 -0500
commit294bbfddc9f2277be27fd2913699e1f8bd03f25e (patch)
tree0e6f06ea3bb7caf4aca75ee0b4744fa367c31973
parent50aecf2cb30123665d715b0872f8680cbfb464e9 (diff)
downloadkpilot-294bbfddc9f2277be27fd2913699e1f8bd03f25e.tar.gz
kpilot-294bbfddc9f2277be27fd2913699e1f8bd03f25e.zip
Fix FTBFS
This resolves Bug 945 Thanks to Darrell Anderson for the patch!
-rw-r--r--conduits/configure.in.in8
-rw-r--r--configure.in.in6
2 files changed, 7 insertions, 7 deletions
diff --git a/conduits/configure.in.in b/conduits/configure.in.in
index dcf63fe..db7d8d7 100644
--- a/conduits/configure.in.in
+++ b/conduits/configure.in.in
@@ -170,9 +170,9 @@ dnl
dnl ----------------------------------------------------------------------------
AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0
+kpilot_save_cflags="$CPPFLAGS -Itderesources/factory.h"
KDE_CHECK_HEADER(tderesources/factory.h,HAVE_KABC=1,
- AC_MSG_WARN([KPILOT: Older kaddressbook version detected. No address book
- conduit will be compiled.]))
+ AC_MSG_WARN([KPILOT: No tderesources/factory.h found. No address book conduit will be compiled.]))
AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)
])
@@ -183,12 +183,12 @@ dnl
dnl ----------------------------------------------------------------------------
AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
-kpilot_save_cflags="$CPPFLAGS"
+kpilot_save_cflags="$CPPFLAGS -Ipi-notepad.h"
kpilot_save_ldflags="$LDFLAGS"
test -z "$PISOCK_INCLUDE" || CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,
- AC_MSG_WARN([KPILOT: No notepad.h for pilot-link. Your pilot-link is too old.]))
+ AC_MSG_WARN([KPILOT: No notepad.h for pilot-link found. No notepad conduit will be compiled.]))
CPPFLAGS="$kpilot_save_cflags"
LDFLAGS="$kpilot_save_ldflags"
diff --git a/configure.in.in b/configure.in.in
index d122d05..a709ef7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -89,7 +89,7 @@ esac
AC_LANG_PUSH(C++)
-kpilot_save_cflags="$CPPFLAGS"
+kpilot_save_cflags="$CPPFLAGS -Ipi-file.h -Ipi-version.h"
kpilot_save_ldflags="$LDFLAGS"
@@ -108,7 +108,7 @@ dnl Try looking normally
dnl
dnl
if test "x$with_pilot_link" = "xCHECK" ; then
-AC_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )
+KDE_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )
fi
dnl If nothing found, try some other places that might have
@@ -144,7 +144,7 @@ dnl Next, check the version of pilot-link to make sure it's sufficiently new.
dnl
dnl
if test -z "$pisock_path" ; then
- AC_CHECK_HEADER(pi-version.h,[HAVE_PISOCK=1], )
+ KDE_CHECK_HEADER(pi-version.h,[HAVE_PISOCK=1], )
else
test -d "$pisock_path" || HAVE_PISOCK="0"
test -f "$pisock_path/pi-version.h" || HAVE_PISOCK="0"