66 lines
2.7 KiB
Plaintext
66 lines
2.7 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.13 2007/06/09 23:10:45 espie Exp $
|
|
--- configure.in.orig Wed May 30 23:53:52 2007
|
|
+++ configure.in Fri Jun 1 01:48:15 2007
|
|
@@ -532,10 +532,10 @@ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${
|
|
])
|
|
|
|
if test -n "$PKGCONFIG"; then
|
|
- vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
|
|
+ vers=`$PKGCONFIG libwpd --modversion 2>/dev/null`
|
|
if test -n "$vers"
|
|
then
|
|
- LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
|
|
+ LIBWPD_LIBS="`$PKGCONFIG libwpd --libs`"
|
|
LIBWPD_RPATH=
|
|
for args in $LIBWPD_LIBS; do
|
|
case $args in
|
|
@@ -545,7 +545,7 @@ if test -n "$PKGCONFIG"; then
|
|
esac
|
|
done
|
|
LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
|
|
- LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
|
|
+ LIBWPD_CFLAGS="`$PKGCONFIG libwpd --cflags`"
|
|
|
|
AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
|
|
fi
|
|
@@ -984,8 +984,8 @@ dnl *** Check that the paths given to configure are va
|
|
|
|
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)
|
|
@@ -1064,8 +1064,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)
|
|
@@ -1102,7 +1102,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
|
|
@@ -1503,7 +1503,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
|