Attachment #952 for bug #945

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 945
Collapse All | Expand All




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: No kresources/factory.h found. No address book conduit will be compiled.]))
	conduit will be compiled.]))
AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)
])


dnl ----------------------------------------------------------------------------

AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
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 found. No notepad conduit will be compiled.]))

CPPFLAGS="$kpilot_save_cflags"
LDFLAGS="$kpilot_save_ldflags"





AC_LANG_PUSH(C++)

kpilot_save_cflags="$CPPFLAGS -Ipi-file.h -Ipi-version.h"
kpilot_save_ldflags="$LDFLAGS"



dnl
dnl
if test "x$with_pilot_link" = "xCHECK" ; then
KDE_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )
fi

dnl If nothing found, try some other places that might have

dnl
dnl
if test -z "$pisock_path" ; then
	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"

Return to bug 945

Lines 89-95 Link Here

(-)kpilot/configure.in.in (-3 / +3 lines)
89		89
90	AC_LANG_PUSH(C++)	90	AC_LANG_PUSH(C++)
91		91
92	kpilot_save_cflags="$CPPFLAGS"	92	kpilot_save_cflags="$CPPFLAGS -Ipi-file.h -Ipi-version.h"
93	kpilot_save_ldflags="$LDFLAGS"	93	kpilot_save_ldflags="$LDFLAGS"
94		94
95		95
Lines 108-114 Link Here
108	dnl	108	dnl
109	dnl	109	dnl
110	if test "x$with_pilot_link" = "xCHECK" ; then	110	if test "x$with_pilot_link" = "xCHECK" ; then
111	AC_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )	111	KDE_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )
112	fi	112	fi
113		113
114	dnl If nothing found, try some other places that might have	114	dnl If nothing found, try some other places that might have
Lines 144-150 Link Here
144	dnl	144	dnl
145	dnl	145	dnl
146	if test -z "$pisock_path" ; then	146	if test -z "$pisock_path" ; then
147	AC_CHECK_HEADER(pi-version.h,[HAVE_PISOCK=1], )	147	KDE_CHECK_HEADER(pi-version.h,[HAVE_PISOCK=1], )
148	else	148	else
149	test -d "$pisock_path" \|\| HAVE_PISOCK="0"	149	test -d "$pisock_path" \|\| HAVE_PISOCK="0"
150	test -f "$pisock_path/pi-version.h" \|\| HAVE_PISOCK="0"	150	test -f "$pisock_path/pi-version.h" \|\| HAVE_PISOCK="0"

Lines 170-178 Link Here

(-)kpilot/conduits/configure.in.in (-4 / +4 lines)
170	dnl ----------------------------------------------------------------------------	170	dnl ----------------------------------------------------------------------------
171		171
172	AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0	172	AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0
		173	kpilot_save_cflags="$CPPFLAGS -Ikresources/factory.h"
173	KDE_CHECK_HEADER(kresources/factory.h,HAVE_KABC=1,	174	KDE_CHECK_HEADER(kresources/factory.h,HAVE_KABC=1,
174	AC_MSG_WARN([KPILOT: Older kaddressbook version detected. No address book	175	AC_MSG_WARN([KPILOT: No kresources/factory.h found. No address book conduit will be compiled.]))
175	conduit will be compiled.]))
176	AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)	176	AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)
177	])	177	])
178		178
Lines 183-194 Link Here
183	dnl ----------------------------------------------------------------------------	183	dnl ----------------------------------------------------------------------------
184		184
185	AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0	185	AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
186	kpilot_save_cflags="$CPPFLAGS"	186	kpilot_save_cflags="$CPPFLAGS -Ipi-notepad.h"
187	kpilot_save_ldflags="$LDFLAGS"	187	kpilot_save_ldflags="$LDFLAGS"
188		188
189	test -z "$PISOCK_INCLUDE" \|\| CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"	189	test -z "$PISOCK_INCLUDE" \|\| CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
190	KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,	190	KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,
191	AC_MSG_WARN([KPILOT: No notepad.h for pilot-link. Your pilot-link is too old.]))	191	AC_MSG_WARN([KPILOT: No notepad.h for pilot-link found. No notepad conduit will be compiled.]))
192		192
193	CPPFLAGS="$kpilot_save_cflags"	193	CPPFLAGS="$kpilot_save_cflags"
194	LDFLAGS="$kpilot_save_ldflags"	194	LDFLAGS="$kpilot_save_ldflags"