projects
/
gnucomo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add /usr/local/include to the include path
[gnucomo.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
0b57e30
..
8a70d5a
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,7
+1,7
@@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/gcm_input/message.h)
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/gcm_input/message.h)
-AM_INIT_AUTOMAKE(GnuCoMo, 0.0.
9
)
+AM_INIT_AUTOMAKE(GnuCoMo, 0.0.
10
)
dnl Checks for programs.
dnl Checks for programs.
@@
-31,7
+31,8
@@
XML_CFLAGS=`$XML_CONFIG --cflags`
XML_LFLAGS=`$XML_CONFIG --libs`
LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
XML_LFLAGS=`$XML_CONFIG --libs`
LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
-LIBS="$LIBS -L/usr/local/lib $XML_LFLAGS"
+LIBS="$LIBS $XML_LFLAGS"
+#LIBS="$LIBS -L/usr/local/lib $XML_LFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS $XML_CFLAGS "
CXXFLAGS="$CXXFLAGS -Wno-deprecated $X_CFLAGS $XML_CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS $XML_CFLAGS "
CXXFLAGS="$CXXFLAGS -Wno-deprecated $X_CFLAGS $XML_CFLAGS"
@@
-41,14
+42,10
@@
AC_CHECK_LIB(AXE, main, , AC_MSG_ERROR(AXE Library is not installed))
#AC_CHECK_LIB(pthread, pthread_create)
AC_CHECK_LIB(xml2, xmlParseFile)
#AC_CHECK_LIB(pthread, pthread_create)
AC_CHECK_LIB(xml2, xmlParseFile)
-# Find PostgreSQL includes and libraries
-AC_PATH_PROGS(PG_CONFIG, pqxx-config)
-if test -z "$PG_CONFIG" || test ! -r "$PG_CONFIG"; then
- AC_MSG_ERROR([libpqxx configuration script was not found])
-fi
-with_postgres_include=`$PG_CONFIG --cflags`
+# PostgreSQL includes and libraries
+with_postgres_include="-I/usr/include/pqxx"
AC_MSG_NOTICE([using PostgreSQL headers at $with_postgres_include])
AC_MSG_NOTICE([using PostgreSQL headers at $with_postgres_include])
-with_postgres_lib=
`$PG_CONFIG --libs`
+with_postgres_lib=
"-lpqxx -lpq"
AC_MSG_NOTICE([using PostgreSQL libraries at $with_postgres_lib])
AC_SUBST(with_postgres_lib)
AC_MSG_NOTICE([using PostgreSQL libraries at $with_postgres_lib])
AC_SUBST(with_postgres_lib)
@@
-74,8
+71,8
@@
LIBS="$LIBS $POSTGRES_LIB"
# There is no convenient way to detect libpqxx, so we'll
# use fixed paths for the time being.
# 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"
-LIBS="$LIBS -L/usr/local/pqxx/lib -lpqxx"
+
#
CXXFLAGS="$CXXFLAGS -I/usr/local/pqxx/include"
+
#
LIBS="$LIBS -L/usr/local/pqxx/lib -lpqxx"
dnl Checks for header files.
AC_HEADER_DIRENT
dnl Checks for header files.
AC_HEADER_DIRENT
@@
-93,4
+90,4
@@
dnl Edit this to be your web server's document root
DocumentRoot=/var/www/html
#AC_OUTPUT(Makefile src/Makefile src/lib/Makefile src/gcm_input/Makefile src/web/Makefile)
DocumentRoot=/var/www/html
#AC_OUTPUT(Makefile src/Makefile src/lib/Makefile src/gcm_input/Makefile src/web/Makefile)
-AC_OUTPUT(Makefile src/Makefile src/lib/Makefile src/gcm_input/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/lib/Makefile src/gcm_input/Makefile
test/Makefile
)