61 lines
2.4 KiB
Plaintext
61 lines
2.4 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.9 2006/08/04 10:35:19 espie Exp $
|
|
--- configure.in.orig Sun Jul 9 04:30:54 2006
|
|
+++ configure.in Fri Jul 14 18:40:32 2006
|
|
@@ -935,8 +935,8 @@ dnl *** Check that the paths given to co
|
|
|
|
AC_MSG_CHECKING([for PostgreSQL C API libraries])
|
|
pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
|
|
- AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
|
|
- if test -r $pgsql_libdir/libpq.so; then
|
|
+ AC_FIND_FILE(libpq.a, $pgsql_libdirs, pgsql_libdir)
|
|
+ if test -r $pgsql_libdir/libpq.a; then
|
|
PG_LIBDIR=$pgsql_libdir
|
|
AC_MSG_RESULT([$PG_LIBDIR])
|
|
AC_SUBST(PG_LIBDIR)
|
|
@@ -1015,8 +1015,8 @@ dnl ====================================
|
|
if test "$compile_pgsql_plugin" = "yes"; then
|
|
AC_MSG_CHECKING([for PostgreSQL C++ libraries])
|
|
pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
|
|
- AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir)
|
|
- if test -r $pqxx_libdir/libpqxx.so; then
|
|
+ AC_FIND_FILE(libpqxx.a, $pqxx_libdirs, pqxx_libdir)
|
|
+ if test -r $pqxx_libdir/libpqxx.a; then
|
|
PQXX_LIBDIR=$pqxx_libdir
|
|
AC_MSG_RESULT([$PQXX_LIBDIR])
|
|
AC_SUBST(PQXX_LIBDIR)
|
|
@@ -1053,7 +1053,7 @@ 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_FIND_FILE(libknewstuff.so.2.0, $kde_libdirs, knewstuff_libdir)
|
|
ac_knewstuff_libraries="$knewstuff_libdir"
|
|
|
|
if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
|
|
@@ -1221,6 +1221,8 @@ AC_SUBST(LCMS_LIBS)
|
|
# Check if the 1.14 version of lcms is detected
|
|
if test ! "$LCMS_LIBS" = ""
|
|
then
|
|
+kde_safe_cppflags=$CPPFLAGS
|
|
+CPPFLAGS="$CPPFLAGS $all_includes"
|
|
AC_LANG_SAVE
|
|
AC_LANG_CPLUSPLUS
|
|
AC_TRY_COMPILE(
|
|
@@ -1229,6 +1231,7 @@ AC_TRY_COMPILE(
|
|
#error lcms 1.14 detected
|
|
#endif ] , [ ], lcms_version_114='no', lcms_version_114='yes' )
|
|
AC_LANG_RESTORE
|
|
+CPPFLAGS=$kde_safe_cppflags
|
|
fi
|
|
|
|
# IM 6.1.3 changed the number of arguments to GetMagickInfoList
|
|
@@ -1420,7 +1423,7 @@ dnl FILE: ./lib/kotext/configure.in.in
|
|
dnl =======================================================
|
|
|
|
AC_LANG_SAVE
|
|
- AC_LANG_C
|
|
+ AC_LANG_CPLUSPLUS
|
|
dnl Check for aspell library
|
|
KDE_CHECK_HEADERS([kspell2/broker.h])
|
|
if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then
|