diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-05 09:13:26 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-10 09:37:27 +0200 |
| commit | 47a1b1b49ec22c4c81356fb44d77f7d026bba96a (patch) | |
| tree | 40728f91e0768639a5f87ee4ed4162400718f511 | |
| parent | 3475e0904aeb1ce0c7fedbd3c518ea5ed796f520 (diff) | |
| download | kpilot-47a1b1b49ec22c4c81356fb44d77f7d026bba96a.tar.gz kpilot-47a1b1b49ec22c4c81356fb44d77f7d026bba96a.zip | |
Fix FTBFS
This resolves Bug 945
Thanks to Darrell Anderson for the patch!
(cherry picked from commit 294bbfddc9f2277be27fd2913699e1f8bd03f25e)
| -rw-r--r-- | conduits/configure.in.in | 8 | ||||
| -rw-r--r-- | configure.in.in | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/conduits/configure.in.in b/conduits/configure.in.in index c6a0d14..64ae647 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 -Ikresources/factory.h" KDE_CHECK_HEADER(kresources/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 kresources/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 79d4ecb..c142601 100644 --- a/configure.in.in +++ b/configure.in.in @@ -88,7 +88,7 @@ esac AC_LANG_PUSH(C++) -kpilot_save_cflags="$CPPFLAGS" +kpilot_save_cflags="$CPPFLAGS -Ipi-file.h -Ipi-version.h" kpilot_save_ldflags="$LDFLAGS" @@ -107,7 +107,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 @@ -143,7 +143,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" |