applied_patches/0354-sdbc-postgresql-config_office.diff

   1 --- configure.in.old    2009-04-06 16:42:08.000000000 +0000
   2 +++ configure.in        2009-04-06 16:42:08.000000000 +0000
   3 @@ -3986,6 +3986,23 @@ AC_SUBST(SYSTEM_HSQLDB)
   4  AC_SUBST(HSQLDB_JAR)
   5
   6  dnl ===================================================================
   7 +dnl Check for PostgreSQL stuff
   8 +dnl ===================================================================
   9 +AC_PATH_PROG(PGCONFIG, pg_config)
  10 +if test -z "$PGCONFIG"; then
  11 +       AC_MSG_ERROR([pg_config needed])
  12 +fi
  13 +save_CFLAGS=$CFLAGS
  14 +save_LIBS=$LIBS
  15 +CFLAGS="-I`pg_config --includedir`"
  16 +AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
  17 +AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
  18 +CFLAGS=$save_CFLAGS
  19 +LIBS=$save_LIBS
  20 +SYSTEM_POSTGRESQL=YES # only option atm :-)
  21 +AC_SUBST(SYSTEM_POSTGRESQL)
  22 +
  23 +dnl ===================================================================
  24  dnl Check for system beanshell
  25  dnl ===================================================================
  26  AC_MSG_CHECKING([which beanshell to use])
  27 --- set_soenv.in.old    2009-04-06 16:42:08.000000000 +0000
  28 +++ set_soenv.in        2009-04-06 16:42:08.000000000 +0000
  29 @@ -2028,6 +2028,7 @@ ToFile( "USE_XINERAMA",      "@USE_XINER
  30  ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
  31  ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
  32  ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
  33 +ToFile( "SYSTEM_POSTGRESQL",  "@SYSTEM_POSTGRESQL@", "e" );
  34  ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
  35  ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
  36  ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );