configure.in cleanups - Mailing list pgsql-patches
From | Bruce Momjian |
---|---|
Subject | configure.in cleanups |
Date | |
Msg-id | 200212290355.gBT3trG01344@candle.pha.pa.us Whole thread Raw |
List | pgsql-patches |
I have applied the following patch to clean up some quoting in configure.in. configure output file did not change. -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073 Index: configure.in =================================================================== RCS file: /cvsroot/pgsql-server/configure.in,v retrieving revision 1.222 diff -c -c -r1.222 configure.in *** configure.in 15 Dec 2002 03:16:58 -0000 1.222 --- configure.in 29 Dec 2002 03:25:46 -0000 *************** *** 618,627 **** AC_CHECK_LIB(resolv, main) AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt]) # QNX: ! AC_CHECK_LIB([[unix]], main) AC_SEARCH_LIBS(crypt, crypt) # BeOS: ! AC_CHECK_LIB(bind, __inet_ntoa) # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) # Cygwin: --- 618,627 ---- AC_CHECK_LIB(resolv, main) AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt]) # QNX: ! AC_CHECK_LIB(unix, main) AC_SEARCH_LIBS(crypt, crypt) # BeOS: ! AC_CHECK_LIB(bind, __inet_ntoa) # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) # Cygwin: *************** *** 646,653 **** fi if test "$with_krb4" = yes ; then ! AC_CHECK_LIB(des, [des_encrypt], [], [AC_MSG_ERROR([library 'des' is required for Kerberos 4])]) ! AC_CHECK_LIB(krb, [krb_sendauth], [], [AC_MSG_ERROR([library 'krb' is required for Kerberos 4])]) fi if test "$with_krb5" = yes ; then --- 646,653 ---- fi if test "$with_krb4" = yes ; then ! AC_CHECK_LIB(des, des_encrypt, [], [AC_MSG_ERROR([library 'des' is required for Kerberos 4])]) ! AC_CHECK_LIB(krb, krb_sendauth, [], [AC_MSG_ERROR([library 'krb' is required for Kerberos 4])]) fi if test "$with_krb5" = yes ; then *************** *** 661,672 **** if test "$with_openssl" = yes ; then dnl Order matters! ! AC_CHECK_LIB(crypto, [CRYPTO_new_ex_data], [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ! AC_CHECK_LIB(ssl, [SSL_library_init], [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) fi if test "$with_pam" = yes ; then ! AC_CHECK_LIB(pam, [pam_start], [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) fi --- 661,672 ---- if test "$with_openssl" = yes ; then dnl Order matters! ! AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ! AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) fi if test "$with_pam" = yes ; then ! AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) fi *************** *** 679,686 **** # At least on IRIX, cpp test for netinet/tcp.h will fail unless # netinet/in.h is included first. ! AC_CHECK_HEADERS([netinet/in.h]) ! AC_CHECK_HEADERS([netinet/tcp.h], [], [], [AC_INCLUDES_DEFAULT #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> --- 679,686 ---- # At least on IRIX, cpp test for netinet/tcp.h will fail unless # netinet/in.h is included first. ! AC_CHECK_HEADERS(netinet/in.h) ! AC_CHECK_HEADERS(netinet/tcp.h, [], [], [AC_INCLUDES_DEFAULT #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> *************** *** 688,701 **** ]) if test "$with_readline" = yes; then ! AC_CHECK_HEADERS([readline/readline.h], [], ! [AC_CHECK_HEADERS([readline.h], [], [AC_MSG_ERROR([readline header not found If you have readline already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support.])])]) ! AC_CHECK_HEADERS([readline/history.h], [], ! [AC_CHECK_HEADERS([history.h], [], [AC_MSG_ERROR([history header not found If you have readline already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. --- 688,701 ---- ]) if test "$with_readline" = yes; then ! AC_CHECK_HEADERS(readline/readline.h, [], ! [AC_CHECK_HEADERS(readline.h, [], [AC_MSG_ERROR([readline header not found If you have readline already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. Use --without-readline to disable readline support.])])]) ! AC_CHECK_HEADERS(readline/history.h, [], ! [AC_CHECK_HEADERS(history.h, [], [AC_MSG_ERROR([history header not found If you have readline already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. *************** *** 719,730 **** fi if test "$with_openssl" = yes ; then ! AC_CHECK_HEADER([openssl/ssl.h], [], [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL])]) ! AC_CHECK_HEADER([openssl/err.h], [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])]) fi if test "$with_pam" = yes ; then ! AC_CHECK_HEADER([security/pam_appl.h], [], [AC_MSG_ERROR([header file <security/pam_appl.h> is required for PAM])]) fi --- 719,730 ---- fi if test "$with_openssl" = yes ; then ! AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL])]) ! AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])]) fi if test "$with_pam" = yes ; then ! AC_CHECK_HEADER(security/pam_appl.h, [], [AC_MSG_ERROR([header file <security/pam_appl.h> is required for PAM])]) fi *************** *** 758,770 **** if test "$with_krb5" = yes; then # Check for differences between MIT and Heimdal (KTH) releases ! AC_CHECK_MEMBERS([krb5_ticket.enc_part2], [], [AC_CHECK_MEMBERS([krb5_ticket.client], [], [AC_MSG_ERROR([could not determine how to get client name from Kerberos 5 ticket])], [#include <krb5.h>])], [#include <krb5.h>]) ! AC_CHECK_MEMBERS([krb5_error.text.data], [], ! [AC_CHECK_MEMBERS([krb5_error.e_data], [], [AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])], [#include <krb5.h>])], [#include <krb5.h>]) --- 758,770 ---- if test "$with_krb5" = yes; then # Check for differences between MIT and Heimdal (KTH) releases ! AC_CHECK_MEMBERS(krb5_ticket.enc_part2, [], [AC_CHECK_MEMBERS([krb5_ticket.client], [], [AC_MSG_ERROR([could not determine how to get client name from Kerberos 5 ticket])], [#include <krb5.h>])], [#include <krb5.h>]) ! AC_CHECK_MEMBERS(krb5_error.text.data, [], ! [AC_CHECK_MEMBERS(krb5_error.e_data, [], [AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])], [#include <krb5.h>])], [#include <krb5.h>]) *************** *** 1096,1102 **** # We also check for sig_atomic_t, which *should* be defined per ANSI # C, but is missing on some old platforms. ! AC_CHECK_TYPES([sig_atomic_t], [], [], [#include <signal.h>]) PGAC_FUNC_POSIX_SIGNALS --- 1096,1102 ---- # We also check for sig_atomic_t, which *should* be defined per ANSI # C, but is missing on some old platforms. ! AC_CHECK_TYPES(sig_atomic_t, [], [], [#include <signal.h>]) PGAC_FUNC_POSIX_SIGNALS *************** *** 1149,1155 **** # PGAC_PROG_NSGMLS PGAC_PROG_JADE ! PGAC_CHECK_DOCBOOK([3.1]) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX AC_CHECK_PROGS(SGMLSPL, sgmlspl) --- 1149,1155 ---- # PGAC_PROG_NSGMLS PGAC_PROG_JADE ! PGAC_CHECK_DOCBOOK(3.1) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX AC_CHECK_PROGS(SGMLSPL, sgmlspl)
pgsql-patches by date: