Mercurial > hg > xemacs-beta

comparison configure.ac @ 3050:67b6f3514ffc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-11-07 08:49:12 by stephent] Various small patches (also commit configure): Minor improvements to INSTALL <877jbk3nkk.fsf@tleepslib.sk.tsukuba.ac.jp> Add description of changed options to INSTALL <873bm83ncd.fsf@tleepslib.sk.tsukuba.ac.jp> Check for libpq (PostgreSQL) linking against SSL and crypto <87y8402820.fsf@tleepslib.sk.tsukuba.ac.jp> Include module INLINE_HEADERs in inline.c unconditionally <87u0eo27rn.fsf@tleepslib.sk.tsukuba.ac.jp> Fix use of AC_INIT <87pspc27oh.fsf@tleepslib.sk.tsukuba.ac.jp> Minor ChangeLog repairs <87ll0027jq.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Mon, 07 Nov 2005 08:49:25 +0000
parents e4c2385012ba
children 7679bfa253c2
comparison
equal deleted inserted replaced
3049:184482827eb5 3050:67b6f3514ffc
22 dnl Due to a dependence on the implementation of certain internal autoconf 22 dnl Due to a dependence on the implementation of certain internal autoconf
23 dnl macros, die if any version other than 2.59 is used. 23 dnl macros, die if any version other than 2.59 is used.
24 AC_PREREQ(2.59)dnl 24 AC_PREREQ(2.59)dnl
25 m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59]), 1, 25 m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59]), 1,
26 [m4_fatal([This script can only be generated with autoconf 2.59])], [])dnl 26 [m4_fatal([This script can only be generated with autoconf 2.59])], [])dnl
27 AC_INIT(src/lisp.h)dnl 27 AC_INIT([XEmacs],[21.5],[xemacs-beta@xemacs.org])dnl
28 AC_CONFIG_SRCDIR(src/lisp.h)dnl
28 dnl 29 dnl
29 dnl ------------------------------------------------------------------------- 30 dnl -------------------------------------------------------------------------
30 dnl Local copyright notices. 31 dnl Local copyright notices.
31 32
32 AC_COPYRIGHT( 33 AC_COPYRIGHT(
3705 for header_dir in "" "pgsql/" "postgresql/"; do 3706 for header_dir in "" "pgsql/" "postgresql/"; do
3706 AC_CHECK_HEADER(${header_dir}libpq-fe.h, 3707 AC_CHECK_HEADER(${header_dir}libpq-fe.h,
3707 libpq_fe_h_file=${header_dir}libpq-fe.h; break) 3708 libpq_fe_h_file=${header_dir}libpq-fe.h; break)
3708 done 3709 done
3709 3710
3710 test -n "$libpq_fe_h_file" && { AC_CHECK_LIB(pq,PQconnectdb,have_libpq=yes) } 3711 pq_libs=
3712 extra_libs=
3713 if test -n "$libpq_fe_h_file"; then
3714 dnl #### Would it be nicer to do this with a loop?
3715 dnl It seems unlikely that checking for SSL/crypto support can hurt,
3716 dnl even if it's found.
3717 AC_CHECK_LIB(pq, PQconnectdb,[pq_libs="-lpq"],[
3718 unset ac_cv_lib_pq_PQconnectdb;
3719 AC_CHECK_LIB(pq, PQconnectdb,[pq_libs="-lpq -lcrypto -lssl"],,
3720 [-lcrypto -lssl])])
3721 if test -z "$pq_libs"; then
3722 have_libpq="no"
3723 else
3724 have_libpq="yes"
3725 fi
3726 fi
3711 3727
3712 if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then 3728 if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
3713 with_postgresql=yes 3729 with_postgresql=yes
3714 AC_DEFINE(HAVE_POSTGRESQL) 3730 AC_DEFINE(HAVE_POSTGRESQL)
3715 AC_CHECK_LIB(pq,PQconnectStart, [ 3731 AC_CHECK_LIB(pq,PQconnectStart, [
3716 with_postgresqlv7=yes; 3732 with_postgresqlv7=yes;
3717 AC_DEFINE(HAVE_POSTGRESQLV7)]) 3733 AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs)
3718 AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file") 3734 AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
3719 XE_PREPEND(-lpq, postgresql_libs) 3735 XE_PREPEND([$pq_libs], postgresql_libs)
3720 XE_APPEND(modules/postgresql, MAKE_SUBDIR) 3736 XE_APPEND(modules/postgresql, MAKE_SUBDIR)
3721 need_modules_common=yes 3737 need_modules_common=yes
3722 if test "$enable_modules" = "yes"; then 3738 if test "$enable_modules" = "yes"; then
3723 XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR) 3739 XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR)
3724 fi 3740 fi