gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-15 16:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve code to locate postgres headers

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
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> 2005-08-03 Richard Frith-Macdonald <rfm@gnu.org>
* GNUmakefile: Add SQLClient_LIBRARIES_DEPEND_UPON for apple as * GNUmakefile: Add SQLClient_LIBRARIES_DEPEND_UPON for apple as

1371
configure vendored
View file

File diff suppressed because it is too large Load diff

129
configure.ac
View file

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