-# $PostgreSQL: pgsql/config/general.m4,v 1.6 2006/10/13 20:23:07 petere Exp $
+# $PostgreSQL: pgsql/config/general.m4,v 1.7 2006/10/30 22:15:04 petere Exp $
# This file defines new macros to process configure command line
# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
m4_define([pgac_arg_to_variable],
[$1[]_[]patsubst($2, -, _)])
-# This is the divert which we store all declared 'with' and 'enable'
-# arguments for use with PGAC_CHECK_ARGS
-m4_define([_m4_divert(PGAC_ARGS)], 5432)
# PGAC_ARG(TYPE, NAME, HELP-STRING,
# [ACTION-IF-YES], [ACTION-IF-NO], [ACTION-IF-ARG],
AC_DEFUN([PGAC_ARG],
[
-m4_divert_text([PGAC_ARGS],[pgac_arg_to_variable([$1],[$2])) ;;])
+pgac_args="$pgac_args pgac_arg_to_variable([$1],[$2])"
m4_case([$1],
enable, [
)
])# PGAC_ARG
-# PGAC_CHECK_ARGS()
-# -----------------
-# Checks if the user passed any --with/without/enable/disable arguments that
-# we don't recognize. Just prints out a warning message, so this should be
-# called near the end, so the user will see it.
-
-AC_DEFUN([PGAC_CHECK_ARGS],
-[
- for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
- case $pgac_var in
- m4_undivert([PGAC_ARGS])
- with_gnu_ld) ;;
- *)
- pgac_txt=`echo $pgac_var | tr '_' '-'`
- AC_MSG_WARN([option ignored: --$pgac_txt])
- ;;
- esac
+# PGAC_ARG_CHECK()
+# ----------------
+# Checks if the user passed any --with/without/enable/disable
+# arguments that were not defined. Just prints out a warning message,
+# so this should be called near the end, so the user will see it.
+
+AC_DEFUN([PGAC_ARG_CHECK],
+[for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
+ for pgac_arg in $pgac_args with_gnu_ld; do
+ if test "$pgac_var" = "$pgac_arg"; then
+ continue 2
+ fi
done
-])# PGAC_CHECK_ARGS
+ pgac_txt=`echo $pgac_var | tr '_' '-'`
+ AC_MSG_WARN([option ignored: --$pgac_txt])
+done])# PGAC_ARG_CHECK
# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING,
# [ACTION-IF-YES], [ACTION-IF-NO])
echo $ECHO_N "checking which template to use... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_template"
# Check whether --with-template or --without-template was given.
# Installation directory for documentation
#
-
+pgac_args="$pgac_args with_docdir"
# Check whether --with-docdir or --without-docdir was given.
# Add non-standard directories to the include path
#
-
+pgac_args="$pgac_args with_includes"
# Check whether --with-includes or --without-includes was given.
# Add non-standard directories to the library search path
#
-
+pgac_args="$pgac_args with_libraries"
# Check whether --with-libraries or --without-libraries was given.
-
+pgac_args="$pgac_args with_libs"
# Check whether --with-libs or --without-libs was given.
echo "$as_me:$LINENO: checking whether to build with 64-bit integer date/time support" >&5
echo $ECHO_N "checking whether to build with 64-bit integer date/time support... $ECHO_C" >&6
-
+pgac_args="$pgac_args enable_integer_datetimes"
# Check whether --enable-integer-datetimes or --disable-integer-datetimes was given.
if test "${enable_integer_datetimes+set}" = set; then
echo "$as_me:$LINENO: checking whether NLS is wanted" >&5
echo $ECHO_N "checking whether NLS is wanted... $ECHO_C" >&6
-
+pgac_args="$pgac_args enable_nls"
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
echo "$as_me:$LINENO: checking for default port number" >&5
echo $ECHO_N "checking for default port number... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_pgport"
# Check whether --with-pgport or --without-pgport was given.
# Option to disable shared libraries
#
-
+pgac_args="$pgac_args enable_shared"
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
# '-rpath'-like feature can be disabled
#
-
+pgac_args="$pgac_args enable_rpath"
# Check whether --enable-rpath or --disable-rpath was given.
if test "${enable_rpath+set}" = set; then
# Spinlocks
#
-
+pgac_args="$pgac_args enable_spinlocks"
# Check whether --enable-spinlocks or --disable-spinlocks was given.
if test "${enable_spinlocks+set}" = set; then
# --enable-debug adds -g to compiler flags
#
-
+pgac_args="$pgac_args enable_debug"
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
# DTrace
#
-
+pgac_args="$pgac_args enable_dtrace"
# Check whether --enable-dtrace or --disable-dtrace was given.
if test "${enable_dtrace+set}" = set; then
# to use, although the standard way to do this is to set the CC environment
# variable.
-
+pgac_args="$pgac_args with_CC"
# Check whether --with-CC or --without-CC was given.
# Automatic dependency tracking
#
-
+pgac_args="$pgac_args enable_depend"
# Check whether --enable-depend or --disable-depend was given.
if test "${enable_depend+set}" = set; then
# Enable assert checks
#
-
+pgac_args="$pgac_args enable_cassert"
# Check whether --enable-cassert or --disable-cassert was given.
if test "${enable_cassert+set}" = set; then
echo "$as_me:$LINENO: checking allow thread-safe client libraries" >&5
echo $ECHO_N "checking allow thread-safe client libraries... $ECHO_C" >&6
-
+pgac_args="$pgac_args enable_thread_safety"
# Check whether --enable-thread-safety or --disable-thread-safety was given.
if test "${enable_thread_safety+set}" = set; then
fi;
-
+pgac_args="$pgac_args enable_thread_safety_force"
# Check whether --enable-thread-safety-force or --disable-thread-safety-force was given.
if test "${enable_thread_safety_force+set}" = set; then
echo "$as_me:$LINENO: checking whether to build with Tcl" >&5
echo $ECHO_N "checking whether to build with Tcl... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_tcl"
# Check whether --with-tcl or --without-tcl was given.
# This will override the use of tclsh to find the paths to search.
-
+pgac_args="$pgac_args with_tclconfig"
# Check whether --with-tclconfig or --without-tclconfig was given.
echo "$as_me:$LINENO: checking whether to build Perl modules" >&5
echo $ECHO_N "checking whether to build Perl modules... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_perl"
# Check whether --with-perl or --without-perl was given.
echo "$as_me:$LINENO: checking whether to build Python modules" >&5
echo $ECHO_N "checking whether to build Python modules... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_python"
# Check whether --with-python or --without-python was given.
echo "$as_me:$LINENO: checking whether to build with Kerberos 5 support" >&5
echo $ECHO_N "checking whether to build with Kerberos 5 support... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_krb5"
# Check whether --with-krb5 or --without-krb5 was given.
# Kerberos configuration parameters
#
-
+pgac_args="$pgac_args with_krb_srvnam"
# Check whether --with-krb-srvnam or --without-krb-srvnam was given.
echo "$as_me:$LINENO: checking whether to build with PAM support" >&5
echo $ECHO_N "checking whether to build with PAM support... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_pam"
# Check whether --with-pam or --without-pam was given.
echo "$as_me:$LINENO: checking whether to build with LDAP support" >&5
echo $ECHO_N "checking whether to build with LDAP support... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_ldap"
# Check whether --with-ldap or --without-ldap was given.
echo "$as_me:$LINENO: checking whether to build with Bonjour support" >&5
echo $ECHO_N "checking whether to build with Bonjour support... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_bonjour"
# Check whether --with-bonjour or --without-bonjour was given.
echo "$as_me:$LINENO: checking whether to build with OpenSSL support" >&5
echo $ECHO_N "checking whether to build with OpenSSL support... $ECHO_C" >&6
-
+pgac_args="$pgac_args with_openssl"
# Check whether --with-openssl or --without-openssl was given.
# Readline
#
-
+pgac_args="$pgac_args with_readline"
# Check whether --with-readline or --without-readline was given.
# Prefer libedit
#
-
+pgac_args="$pgac_args with_libedit_preferred"
# Check whether --with-libedit-preferred or --without-libedit-preferred was given.
# Zlib
#
-
+pgac_args="$pgac_args with_zlib"
# Check whether --with-zlib or --without-zlib was given.
ac_config_headers="$ac_config_headers src/interfaces/ecpg/include/ecpg_config.h"
-
-#
-# Warn about unknown options
-#
-
-
- for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
- case $pgac_var in
- with_template) ;;
-with_docdir) ;;
-with_includes) ;;
-with_libraries) ;;
-with_libs) ;;
-enable_integer_datetimes) ;;
-enable_nls) ;;
-with_pgport) ;;
-enable_shared) ;;
-enable_rpath) ;;
-enable_spinlocks) ;;
-enable_debug) ;;
-enable_dtrace) ;;
-with_CC) ;;
-enable_depend) ;;
-enable_cassert) ;;
-enable_thread_safety) ;;
-enable_thread_safety_force) ;;
-with_tcl) ;;
-with_tclconfig) ;;
-with_perl) ;;
-with_python) ;;
-with_krb5) ;;
-with_krb_srvnam) ;;
-with_pam) ;;
-with_ldap) ;;
-with_bonjour) ;;
-with_openssl) ;;
-with_readline) ;;
-with_libedit_preferred) ;;
-with_zlib) ;;
-
- with_gnu_ld) ;;
- *)
- pgac_txt=`echo $pgac_var | tr '_' '-'`
- { echo "$as_me:$LINENO: WARNING: option ignored: --$pgac_txt" >&5
-echo "$as_me: WARNING: option ignored: --$pgac_txt" >&2;}
- ;;
- esac
- done
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
fi
+# Warn about unknown options
+for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
+ for pgac_arg in $pgac_args with_gnu_ld; do
+ if test "$pgac_var" = "$pgac_arg"; then
+ continue 2
+ fi
+ done
+ pgac_txt=`echo $pgac_var | tr '_' '-'`
+ { echo "$as_me:$LINENO: WARNING: option ignored: --$pgac_txt" >&5
+echo "$as_me: WARNING: option ignored: --$pgac_txt" >&2;}
+done