Improve code to locate postgres headers

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@21719 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-09-15 08:25:12 +00:00
parent 56131fc572
commit e1f1c87e86
3 changed files with 929 additions and 610 deletions

View file

@ -1,3 +1,8 @@
2005-09-15 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Locate postgres 8.0 on debian
* configure: regenerate
2005-08-03 Richard Frith-Macdonald <rfm@gnu.org>
* GNUmakefile: Add SQLClient_LIBRARIES_DEPEND_UPON for apple as

1387
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -52,77 +52,96 @@ if test "$MYSQL" = "yes"; then
fi
AC_SUBST(MYSQL)
AC_CHECK_HEADERS(libpq-fe.h)
if test "$ac_cv_header_libpq_fe_h" = "yes"; then
POSTGRES=yes
else
old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/postgresql"
AC_CHECK_HEADERS(/usr/include/postgresql/libpq-fe.h)
CPPFLAGS="$old"
if test "$ac_cv_header__usr_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql"
POSTGRES=
if test "$POSTGRES" = ""; then
AC_CHECK_HEADERS(libpq-fe.h)
if test "$ac_cv_header_libpq_fe_h" = "yes"; then
POSTGRES=yes
else
CPPFLAGS="$CPPFLAGS -I/usr/include/pgsql"
AC_CHECK_HEADERS(/usr/include/pgsql/libpq-fe.h)
CPPFLAGS="$old"
if test "$ac_cv_header__usr_include_pgsql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/pgsql"
POSTGRES=yes
else
CPPFLAGS="$CPPFLAGS -I/usr/local/include/pgsql"
AC_CHECK_HEADERS(/usr/local/include/pgsql/libpq-fe.h)
CPPFLAGS="$old"
if test "$ac_cv_header__usr_local_include_pgsql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/local/include/pgsql"
POSTGRES=yes
else
CPPFLAGS="$save_CPPFLAGS"
POSTGRES=
echo "**************************************************************"
echo "Unable to locate libpq (postgres) headers (are they installed)"
echo "**************************************************************"
fi
fi
fi
fi
if test "$ECPG" = ""; then
AC_CHECK_HEADERS(ecpglib.h)
if test "$ac_cv_header_ecpglib_h" = "yes"; then
ECPG=yes
fi
fi
AC_CHECK_HEADERS(ecpglib.h)
if test "$ac_cv_header_ecpglib_h" = "yes"; then
ECPG=yes
else
old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/postgresql"
AC_CHECK_HEADERS(/usr/include/postgresql/ecpglib.h)
CPPFLAGS="$old"
if test "$ac_cv_header__usr_include_postgresql_ecpglib_h" = "yes"; then
if test "$POSTGRES" = ""; then
AC_CHECK_HEADERS(/usr/include/postgresql/libpq-fe.h)
CPPFLAGS="$save_CPPFLAGS"
if test "$ac_cv_header__usr_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql"
ECPG=yes
else
CPPFLAGS="$CPPFLAGS -I/usr/include/pgsql"
AC_CHECK_HEADERS(/usr/include/pgsql/ecpglib.h)
CPPFLAGS="$old"
if test "$ac_cv_header__usr_include_pgsql_ecpglib_h" = "yes"; then
INCD="$INCD -I/usr/include/pgsql"
ECPG=yes
else
CPPFLAGS="$CPPFLAGS -I/usr/local/include/pgsql"
AC_CHECK_HEADERS(/usr/local/include/pgsql/ecpglib.h)
CPPFLAGS="$old"
if test "$ac_cv_header__usr_local_include_pgsql_ecpglib_h" = "yes"; then
INCD="$INCD -I/usr/local/include/pgsql"
ECPG=yes
else
CPPFLAGS="$save_CPPFLAGS"
ECPG=
echo "*************************************************************"
echo "Unable to locate ecpg (postgres) headers (are they installed)"
echo "*************************************************************"
fi
fi
POSTGRES=yes
fi
fi
if test "$ECPG" = ""; then
AC_CHECK_HEADERS(/usr/include/postgresql/ecpglib.h)
if test "$ac_cv_header__usr_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql"
ECPG=yes
fi
fi
if test "$POSTGRES" = ""; then
AC_CHECK_HEADERS(/usr/include/postgresql/8.0/libpq-fe.h)
CPPFLAGS="$save_CPPFLAGS"
if test "$ac_cv_header__usr_include_postgresql_8_0_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql/8.0"
POSTGRES=yes
fi
fi
if test "$ECPG" = ""; then
AC_CHECK_HEADERS(/usr/include/postgresql/8.0/ecpglib.h)
if test "$ac_cv_header__usr_include_postgresql_8_0_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql/8.0"
ECPG=yes
fi
fi
if test "$POSTGRES" = ""; then
AC_CHECK_HEADERS(/usr/include/pgsql/libpq-fe.h)
CPPFLAGS="$save_CPPFLAGS"
if test "$ac_cv_header__usr_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql"
POSTGRES=yes
fi
fi
if test "$ECPG" = ""; then
AC_CHECK_HEADERS(/usr/include/pgsql/ecpglib.h)
if test "$ac_cv_header__usr_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/include/postgresql"
ECPG=yes
fi
fi
if test "$POSTGRES" = ""; then
AC_CHECK_HEADERS(/usr/local/include/pgsql/libpq-fe.h)
CPPFLAGS="$save_CPPFLAGS"
if test "$ac_cv_header__usr_local_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/local/include/postgresql"
POSTGRES=yes
fi
fi
if test "$ECPG" = ""; then
AC_CHECK_HEADERS(/usr/local/include/pgsql/ecpglib.h)
if test "$ac_cv_header__usr_local_include_postgresql_libpq_fe_h" = "yes"; then
INCD="$INCD -I/usr/local/include/postgresql"
ECPG=yes
fi
fi
if test "$POSTGRES" = ""; then
echo "**************************************************************"
echo "Unable to locate libpq (postgres) headers (are they installed)"
echo "**************************************************************"
fi
if test "$ECPG" = ""; then
echo "*************************************************************"
echo "Unable to locate ecpg (postgres) headers (are they installed)"
echo "*************************************************************"
fi
if test "$POSTGRES" = "yes"; then
# NICOLA - hack
if test -d /usr/lib/pgsql ; then