Mon Dec 13 22:05:01 PST 2004
- Previous message: [Slony1-commit] By darcyb: Cleanup some more compiler warnings
- Next message: [Slony1-commit] By darcyb: Due to lots of SIC regarding the pg_dump safe patches, I'll
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Some more minor cleanups in the build environment, make building with debuging symbols optional
Modified Files:
--------------
slony1-engine:
Makefile (r1.9 -> r1.10)
aclocal.m4 (r1.4 -> r1.5)
configure (r1.34 -> r1.35)
configure.ac (r1.35 -> r1.36)
slony1-engine/config:
compiler.m4 (r1.1 -> r1.2)
general.m4 (r1.1 -> r1.2)
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.35 -r1.36
--- configure.ac
+++ configure.ac
@@ -67,6 +67,9 @@
AC_SUBST(YFLAGS)
AC_SUBST(with_gnu_ld)
+
+SLON_AC_COMPILER()
+
ACX_PTHREAD()
##Portability checks
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lconfigure -Lconfigure -u -w -r1.34 -r1.35
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20041210.
+# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20041213.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -254,8 +254,8 @@
# Identity of this package.
PACKAGE_NAME='postgresql-slony1-engine'
PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20041210'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20041210'
+PACKAGE_VERSION='HEAD_20041213'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20041213'
PACKAGE_BUGREPORT=''
ac_unique_file="src"
@@ -764,7 +764,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures postgresql-slony1-engine HEAD_20041210 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20041213 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -825,10 +825,15 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20041210:";;
+ short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20041213:";;
esac
cat <<\_ACEOF
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-debug build with debugging symbols (-g)
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -917,7 +922,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20041210
+postgresql-slony1-engine configure HEAD_20041213
generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -932,7 +937,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by postgresql-slony1-engine $as_me HEAD_20041210, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20041213, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -2485,6 +2490,42 @@
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+
+ case $enableval in
+ yes)
+ :
+ ;;
+ no)
+ :
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: no argument expected for --enable-debug option" >&5
+echo "$as_me: error: no argument expected for --enable-debug option" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+else
+ enable_debug=no
+
+fi;
+
+
+
+# SLOn_AC_PROG_CC_NO_STRICT_ALIASING
+
+if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
+ CFLAGS="$CFLAGS -g"
+fi
+{ echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
+echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6343,7 +6384,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by postgresql-slony1-engine $as_me HEAD_20041210, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20041213, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6402,7 +6443,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20041210
+postgresql-slony1-engine config.status HEAD_20041213
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -6597,6 +6638,7 @@
s, at YFLAGS@,$YFLAGS,;t t
s, at LEXFLAGS@,$LEXFLAGS,;t t
s, at with_gnu_ld@,$with_gnu_ld,;t t
+s, at enable_debug@,$enable_debug,;t t
s, at acx_pthread_config@,$acx_pthread_config,;t t
s, at PTHREAD_CC@,$PTHREAD_CC,;t t
s, at PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -Laclocal.m4 -Laclocal.m4 -u -w -r1.4 -r1.5
--- aclocal.m4
+++ aclocal.m4
@@ -1,5 +1,7 @@
+m4_include([config/general.m4])
m4_include([config/libtool.m4])
m4_include([config/acx_pthread.m4])
m4_include([config/acx_libpq.m4])
+m4_include([config/compiler.m4])
m4_include([config/docbook.m4])
m4_include([config/docs.m4])
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -LMakefile -LMakefile -u -w -r1.9 -r1.10
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-all check install installdirs install-all-headers installcheck uninstall dep depend clean distclean maintainer-clean dist:
+all check install installdirs installcheck uninstall dep depend clean distclean maintainer-clean dist:
@if [ ! -f GNUmakefile ] ; then \
echo "You need to run the 'configure' program first. See the file"; \
echo "'README' for installation instructions." ; \
Index: compiler.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/compiler.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig/compiler.m4 -Lconfig/compiler.m4 -u -w -r1.1 -r1.2
--- config/compiler.m4
+++ config/compiler.m4
@@ -1,40 +1,34 @@
-PGAC_ARG_BOOL(enable, debug, no,
+AC_DEFUN([SLON_AC_COMPILER],
+[SLON_AC_ARG_BOOL(enable, debug, no,
[ --enable-debug build with debugging symbols (-g)])
AC_SUBST(enable_debug)
-AC_DEFUN([PGAC_PROG_CC_NO_STRICT_ALIASING],
+AC_DEFUN([SLON_AC_PROG_CC_NO_STRICT_ALIASING],
[AC_CACHE_CHECK([how to turn off strict aliasing in $CC],
- pgac_cv_prog_cc_no_strict_aliasing,
-[pgac_save_CFLAGS=$CFLAGS
+ slon_ac_cv_prog_cc_no_strict_aliasing,
+[slon_ac_save_CFLAGS=$CFLAGS
if test "$GCC" = yes; then
- pgac_try="-fno-strict-aliasing"
+ slon_ac_try="-fno-strict-aliasing"
else
# Maybe fill in later...
- pgac_try=
+ slon_ac_try=
fi
-for pgac_flag in $pgac_try; do
- CFLAGS="$pgac_save_CFLAGS $pgac_flag"
+for slon_ac_flag in $slon_ac_try; do
+ CFLAGS="$slon_ac_save_CFLAGS $slon_ac_flag"
_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
- [pgac_cv_prog_cc_no_strict_aliasing=$pgac_try
+ [slon_ac_cv_prog_cc_no_strict_aliasing=$slon_ac_try
break])
done
-CFLAGS=$pgac_save_CFLAGS
+CFLAGS=$slon_ac_save_CFLAGS
])
-if test x"$pgac_cv_prog_cc_no_strict_aliasing" != x""; then
- CFLAGS="$CFLAGS $pgac_cv_prog_cc_no_strict_aliasing"
-fi])# PGAC_PROG_CC_NO_STRICT_ALIASING
+if test x"$slon_ac_cv_prog_cc_no_strict_aliasing" != x""; then
+ CFLAGS="$CFLAGS $slon_ac_cv_prog_cc_no_strict_aliasing"
+fi])# SLOn_AC_PROG_CC_NO_STRICT_ALIASING
-PGAC_PROG_CC_NO_STRICT_ALIASING
if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
CFLAGS="$CFLAGS -g"
fi
-AC_MSG_NOTICE([using CFLAGS=$CFLAGS])
-
-if test "$GCC" = yes; then
-AC_TRY_COMPILE([], [@%:@ifdef __FAST_MATH__
-choke me
-@%:@endif], [], [AC_MSG_ERROR([do not put -ffast-math in CFLAGS])])
-fi
+AC_MSG_NOTICE([using CFLAGS=$CFLAGS])])
Index: general.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/general.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig/general.m4 -Lconfig/general.m4 -u -w -r1.1 -r1.2
--- config/general.m4
+++ config/general.m4
@@ -1,5 +1,3 @@
-# $PostgreSQL: pgsql-server/config/general.m4,v 1.3 2003/11/29 19:51:17 pgsql Exp $
-
# This file defines new macros to process configure command line
# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
# The flaw in these is particularly that they only differentiate
@@ -26,7 +24,7 @@
# as usual. ACTION-IF-YES is executed if the option is given without
# and argument (or "yes", which is the same); similar for ACTION-IF-NO.
-AC_DEFUN([PGAC_ARG],
+AC_DEFUN([SLON_AC_ARG],
[
m4_case([$1],
@@ -66,10 +64,10 @@
[m4_fatal([first argument of $0 must be 'enable' or 'with', not '$1'])]
)
-])# PGAC_ARG
+])# SLON_AC_ARG
-# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING,
+# SLON_AC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING,
# [ACTION-IF-YES], [ACTION-IF-NO])
# -----------------------------------------------
# Accept a boolean option, that is, one that only takes yes or no.
@@ -78,8 +76,8 @@
# (Consequently, one of ACTION-IF-YES and ACTION-IF-NO will always
# execute.)
-AC_DEFUN([PGAC_ARG_BOOL],
-[PGAC_ARG([$1], [$2], [$4], [$5], [$6],
+AC_DEFUN([SLON_AC_ARG_BOOL],
+[SLON_AC_ARG([$1], [$2], [$4], [$5], [$6],
[AC_MSG_ERROR([no argument expected for --$1-$2 option])],
[m4_case([$3],
yes, [pgac_arg_to_variable([$1], [$2])=yes
@@ -87,23 +85,23 @@
no, [pgac_arg_to_variable([$1], [$2])=no
$6],
[m4_fatal([third argument of $0 must be 'yes' or 'no', not '$3'])])])[]dnl
-])# PGAC_ARG_BOOL
+])# SLON_AC_ARG_BOOL
-# PGAC_ARG_REQ(TYPE, NAME, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN])
+# SLON_AC_ARG_REQ(TYPE, NAME, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN])
# -------------------------------------------------------------------------------
# This option will require an argument; "yes" or "no" will not be
# accepted.
-AC_DEFUN([PGAC_ARG_REQ],
-[PGAC_ARG([$1], [$2], [$3],
+AC_DEFUN([SLON_AC_ARG_REQ],
+[SLON_AC_ARG([$1], [$2], [$3],
[AC_MSG_ERROR([argument required for --$1-$2 option])],
[AC_MSG_ERROR([argument required for --$1-$2 option])],
[$4],
[$5])])# PGAC_ARG_REQ
-# PGAC_ARG_OPTARG(TYPE, NAME, HELP-STRING, [DEFAULT-ACTION], [ARG-ACTION]
+# SLON_AC_ARG_OPTARG(TYPE, NAME, HELP-STRING, [DEFAULT-ACTION], [ARG-ACTION]
# [ACTION-ENABLED], [ACTION-DISABLED])
# -----------------------------------------------------------------------
# This will create an option that behaves as follows: If omitted, or
@@ -116,15 +114,15 @@
# The intent is to allow enabling a feature, and optionally pass an
# additional piece of information.
-AC_DEFUN([PGAC_ARG_OPTARG],
-[PGAC_ARG([$1], [$2], [$3], [$4], [],
- [pgac_arg_to_variable([$1], [$2])=yes
+AC_DEFUN([SLON_AC_ARG_OPTARG],
+[SLON_AC_ARG([$1], [$2], [$3], [$4], [],
+ [slon_ac_arg_to_variable([$1], [$2])=yes
$5],
- [pgac_arg_to_variable([$1], [$2])=no])
+ [slon_ac_arg_to_variable([$1], [$2])=no])
dnl Add this code only if there's a ACTION-ENABLED or ACTION-DISABLED.
m4_ifval([$6[]$7],
[
-if test "[$]pgac_arg_to_variable([$1], [$2])" = yes; then
+if test "[$]slon_ac_arg_to_variable([$1], [$2])" = yes; then
m4_default([$6], :)
m4_ifval([$7],
[else
@@ -132,4 +130,4 @@
])[]dnl
fi
])[]dnl
-])# PGAC_ARG_OPTARG
+])# SLON_AC_ARG_OPTARG
- Previous message: [Slony1-commit] By darcyb: Cleanup some more compiler warnings
- Next message: [Slony1-commit] By darcyb: Due to lots of SIC regarding the pg_dump safe patches, I'll
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list