f052892015
- updated to libreoffice-3.4.2.5 (SUSE 3.4.2-rc2) OBS-URL: https://build.opensuse.org/request/show/80943 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=19
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
---
|
|
configure.in | 17 +++++++++++++++++
|
|
set_soenv.in | 1 +
|
|
2 files changed, 18 insertions(+), 0 deletions(-)
|
|
|
|
diff --git configure.in configure.in
|
|
index cc0f65b..3620984 100644
|
|
--- configure.in
|
|
+++ configure.in
|
|
@@ -4239,6 +4239,23 @@ AC_SUBST(SYSTEM_HSQLDB)
|
|
AC_SUBST(HSQLDB_JAR)
|
|
|
|
dnl ===================================================================
|
|
+dnl Check for PostgreSQL stuff
|
|
+dnl ===================================================================
|
|
+AC_PATH_PROG(PGCONFIG, pg_config)
|
|
+if test -z "$PGCONFIG"; then
|
|
+ AC_MSG_ERROR([pg_config needed])
|
|
+fi
|
|
+save_CFLAGS=$CFLAGS
|
|
+save_LIBS=$LIBS
|
|
+CFLAGS="-I`pg_config --includedir`"
|
|
+AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
|
|
+AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
|
|
+CFLAGS=$save_CFLAGS
|
|
+LIBS=$save_LIBS
|
|
+SYSTEM_POSTGRESQL=YES # only option atm :-)
|
|
+AC_SUBST(SYSTEM_POSTGRESQL)
|
|
+
|
|
+dnl ===================================================================
|
|
dnl Check for system beanshell
|
|
dnl ===================================================================
|
|
AC_MSG_CHECKING([which beanshell to use])
|
|
diff --git set_soenv.in set_soenv.in
|
|
index d36115a..ababa63 100644
|
|
--- set_soenv.in
|
|
+++ set_soenv.in
|
|
@@ -1935,6 +1935,7 @@ ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
|
|
ToFile( "SYSTEM_REDLAND", "@SYSTEM_REDLAND@", "e" );
|
|
ToFile( "REDLAND_CFLAGS", "@REDLAND_CFLAGS@", "e" );
|
|
ToFile( "REDLAND_LIBS", "@REDLAND_LIBS@", "e" );
|
|
+ToFile( "SYSTEM_POSTGRESQL", "@SYSTEM_POSTGRESQL@", "e" );
|
|
ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
|
|
ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
|
|
ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
|
|
--
|
|
1.7.0.1
|
|
|