dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/gcm_input/message.h)
-AM_INIT_AUTOMAKE(GNUCOMO, 0.0.7)
+AM_INIT_AUTOMAKE(GnuCoMo, 0.0.8)
dnl Checks for programs.
XML_CFLAGS=`$XML_CONFIG --cflags`
XML_LFLAGS=`$XML_CONFIG --libs`
-LIBS="$LIBS -lAXE -lpq++ $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
LDFLAGS="$LDFLAGS -L/usr/local/lib $XML_LFLAGS"
-CFLAGS="$CFLAGS $X_CFLAGS $XML_CFLAGS -I/usr/include/postgresql"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS $XML_CFLAGS -I/usr/include/postgresql"
-
-AC_CHECK_LIB(AXE, main)
-AC_CHECK_LIB(X11, XOpenDisplay)
-AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData)
-AC_CHECK_LIB(pthread, pthread_create)
+CFLAGS="$CFLAGS $X_CFLAGS $XML_CFLAGS "
+CXXFLAGS="$CXXFLAGS $X_CFLAGS $XML_CFLAGS"
+
+AC_HAVE_LIBRARY(pqxx)
+AC_CHECK_LIB(AXE, main, , AC_MSG_ERROR(AXE Library is not installed))
+#AC_CHECK_LIB(X11, XOpenDisplay)
+#AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData)
+#AC_CHECK_LIB(pthread, pthread_create)
AC_CHECK_LIB(xml2, xmlParseFile)
+
+#
+# There is no convenient way to detect libpqxx, so we'll
+# use fixed paths for the time being.
+
+CXXFLAGS="$CXXFLAGS -I/usr/local/pqxx/include"
+LDFLAGS="$LDFLAGS -L/usr/local/pqxx/lib -lpqxx"
+
dnl Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC