summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorAaron Marks <nymacro@gmail.com>2005-06-28 00:38:48 +0000
committerAaron Marks <nymacro@gmail.com>2005-06-28 00:38:48 +0000
commit63c80c42c18ec3ab899fdfaf2d0975c75f1d9fd7 (patch)
tree9f8ea2b0726634b73d2a0be82f1147a8ea2b252b /configure.ac
parenta78e59b9f2fb4eb7971eb5f46637df80157d787a (diff)
downloadmanaserv-63c80c42c18ec3ab899fdfaf2d0975c75f1d9fd7.tar.gz
manaserv-63c80c42c18ec3ab899fdfaf2d0975c75f1d9fd7.tar.xz
manaserv-63c80c42c18ec3ab899fdfaf2d0975c75f1d9fd7.zip
Updated PostgreSQL defines in source to work with updated configure.
Added XML configuration loader from tmw.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 614a003..82419a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,10 @@ AC_PROG_INSTALL
AC_CHECK_LIB([crypto], [EVP_md5])
AC_CHECK_LIB([physfs], [PHYSFS_init])
+PKG_CHECK_MODULES(XML2,[libxml-2.0])
+CXXFLAGS="$CXXFLAGS $XML2_CFLAGS"
+LIBS="$LIBS $XML2_LIBS"
+
AC_CHECK_LIB_TMW([SDL], [1.2.0])
# update CXXFLAGS and LIBS.
# SDL_CFLAGS and SDL_LIBS are set by AC_CHECK_LIB_TMW.
@@ -78,10 +82,12 @@ if test "$with_storage_backend" = "mysql"; then
elif test "$with_storage_backend" = "postgresql"; then
# use pg_config to check libpq.
# PQ_CFLAGS and PQ_LIBS are set by AC_CHECK_LIB_TMW.
+ # NOTE: PQ_LIBS not set correctly
AC_CHECK_LIB_TMW([pq], [7.0.0], [pg_config])
# update CXXFLAGS and LIBS.
CXXFLAGS="$CXXFLAGS -DPOSTGRESQL_SUPPORT $PQ_CFLAGS"
+ PQ_LIBS="$PQ_LIBS -lpq"
LIBS="$LIBS $PQ_LIBS"
elif test "$with_storage_backend" = "sqlite"; then
# use pkg-config to check libsqlite3.