mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 00:01:51 +02:00
Reorder some things so prerequisite macros don't get expanded implicitly
within a shell conditional.
This commit is contained in:
parent
d67442ccfd
commit
4916f9e97a
23
configure.in
23
configure.in
@ -1,5 +1,5 @@
|
|||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.171 2002/03/29 17:32:52 petere Exp $
|
dnl $Header: /cvsroot/pgsql/configure.in,v 1.172 2002/03/30 00:20:15 petere Exp $
|
||||||
|
|
||||||
dnl Developers, please strive to achieve this order:
|
dnl Developers, please strive to achieve this order:
|
||||||
dnl
|
dnl
|
||||||
@ -748,21 +748,12 @@ if test "$with_pam" = yes ; then
|
|||||||
AC_CHECK_LIB(pam, [pam_start], [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
|
AC_CHECK_LIB(pam, [pam_start], [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$enable_nls" = yes ; then
|
|
||||||
PGAC_CHECK_GETTEXT
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$with_CXX" = yes; then
|
|
||||||
PGAC_CLASS_STRING
|
|
||||||
PGAC_CXX_NAMESPACE_STD
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Header files
|
## Header files
|
||||||
##
|
##
|
||||||
dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
|
dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
|
||||||
AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h strings.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h])
|
AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h])
|
||||||
|
|
||||||
# At least on IRIX, cpp test for netinet/tcp.h will fail unless
|
# At least on IRIX, cpp test for netinet/tcp.h will fail unless
|
||||||
# netinet/in.h is included first.
|
# netinet/in.h is included first.
|
||||||
@ -1179,6 +1170,16 @@ AC_CHECK_TYPES([sig_atomic_t], [], [], [#include <signal.h>])
|
|||||||
PGAC_FUNC_POSIX_SIGNALS
|
PGAC_FUNC_POSIX_SIGNALS
|
||||||
|
|
||||||
|
|
||||||
|
if test "$enable_nls" = yes ; then
|
||||||
|
PGAC_CHECK_GETTEXT
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$with_CXX" = yes; then
|
||||||
|
PGAC_CLASS_STRING
|
||||||
|
PGAC_CXX_NAMESPACE_STD
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Check for Tcl configuration script tclConfig.sh
|
# Check for Tcl configuration script tclConfig.sh
|
||||||
if test "$with_tcl" = yes; then
|
if test "$with_tcl" = yes; then
|
||||||
PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
|
PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
|
||||||
|
Loading…
Reference in New Issue
Block a user