Thu Dec 8 20:47:59 PST 2005
- Previous message: [Slony1-commit] By xfade: Man creation fixes.
- Next message: [Slony1-commit] By cbbrowne: Fixed creation of UTF8 table
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message: ----------- Configure update to include all fixes. Modified Files: -------------- slony1-engine: configure (r1.64 -> r1.65) -------------- next part -------------- Index: configure =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v retrieving revision 1.64 retrieving revision 1.65 diff -Lconfigure -Lconfigure -u -w -r1.64 -r1.65 --- configure +++ configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20051111. +# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20051208. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ # Identity of this package. PACKAGE_NAME='postgresql-slony1-engine' PACKAGE_TARNAME='postgresql-slony1-engine' -PACKAGE_VERSION='HEAD_20051111' -PACKAGE_STRING='postgresql-slony1-engine HEAD_20051111' +PACKAGE_VERSION='HEAD_20051208' +PACKAGE_STRING='postgresql-slony1-engine HEAD_20051208' PACKAGE_BUGREPORT='' ac_unique_file="src" @@ -309,7 +309,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20051111 with_gnu_ld enable_rpath acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS NLSLIB PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR SLONYPATH HOST_OS PORTNAME SLONBINDIR with_docs GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20051208 with_gnu_ld enable_rpath acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS NLSLIB PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN SLONYPATH HOST_OS PORTNAME SLONBINDIR with_docs GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS SGMLSPL d2mdir JADE have_docbook DOCBOOKSTYLE COLLATEINDEX docdir perlsharedir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -782,7 +782,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_20051111 to adapt to many kinds of systems. +\`configure' configures postgresql-slony1-engine HEAD_20051208 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -843,7 +843,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20051111:";; + short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20051208:";; esac cat <<\_ACEOF @@ -865,9 +865,12 @@ --with-pgpkglibdir=<dir> Location of the PostgreSQL pkglibs. E.g. plpgsql.so --with-pgsharedir=<dir> Location of the PostgreSQL share dir. E.g. postgresql.conf.sample --with-netsnmp=<dir> Enable snmp support <dir> is the location of net-snmp-config. **EXPERIMENTAL** - --with-perltools=<dir> Location to install the perl management tools Default $PREFIX/bin. - --with-docdir=<dir> Location to install all the documentation Default is $PREFIX/doc. + --with-perltools=<dir> Location to install the perl management tools. Default $PREFIX/bin. + --with-perlsharedir=<dir> Location to install slon-tools.pm. Default $pglibdir. --with-docs=<yes|no> Build the sgml documentation default=no + --with-docdir=<dir> Location to install all the documentation. Default is $PREFIX/doc. + --with-d2mdir=<dir> Location of docbook2man-spec.pl (Manpages will be skipped if not specified) + --with-mandir=<dir> Location to install the manpages. Default is $PREFIX/man. Some influential environment variables: CC C compiler command @@ -978,7 +981,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -postgresql-slony1-engine configure HEAD_20051111 +postgresql-slony1-engine configure HEAD_20051208 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -992,7 +995,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_20051111, which was +It was created by postgresql-slony1-engine $as_me HEAD_20051208, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -6103,9 +6106,9 @@ fi; -# Check whether --with-docdir or --without-docdir was given. -if test "${with_docdir+set}" = set; then - withval="$with_docdir" +# Check whether --with-perlsharedir or --without-perlsharedir was given. +if test "${with_perlsharedir+set}" = set; then + withval="$with_perlsharedir" fi; @@ -6115,6 +6118,24 @@ fi; +# Check whether --with-docdir or --without-docdir was given. +if test "${with_docdir+set}" = set; then + withval="$with_docdir" + +fi; + +# Check whether --with-d2mdir or --without-d2mdir was given. +if test "${with_d2mdir+set}" = set; then + withval="$with_d2mdir" + +fi; + +# Check whether --with-mandir or --without-mandir was given. +if test "${with_mandir+set}" = set; then + withval="$with_mandir" + +fi; + #Our current path SLONYPATH=`pwd` @@ -9504,8 +9525,6 @@ TOOLSBIN=$TOOLSBIN -DOCDIR=$DOCDIR - HOST_OS=$host_os @@ -9548,7 +9567,7 @@ fi fi if test x"${LOCATION}" != x; then - DOCDIR="${LOCATION}" + docdir="${LOCATION}" fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -9856,6 +9875,60 @@ test -n "$NSGMLS" && break done + for ac_prog in sgmlspl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_SGMLSPL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$SGMLSPL"; then + ac_cv_prog_SGMLSPL="$SGMLSPL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_SGMLSPL="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +SGMLSPL=$ac_cv_prog_SGMLSPL +if test -n "$SGMLSPL"; then + echo "$as_me:$LINENO: result: $SGMLSPL" >&5 +echo "${ECHO_T}$SGMLSPL" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$SGMLSPL" && break +done + + echo "$as_me:$LINENO: checking for docbook2man-spec.pl" >&5 +echo $ECHO_N "checking for docbook2man-spec.pl... $ECHO_C" >&6 +if test -s "$with_d2mdir/docbook2man-spec.pl" ; then + d2mdir=$with_d2mdir + + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + else + echo "$as_me:$LINENO: result: not found, skipping manpages. +Please use --with-d2mdir to specify the path to docbook2man-spec.pl" >&5 +echo "${ECHO_T}not found, skipping manpages. +Please use --with-d2mdir to specify the path to docbook2man-spec.pl" >&6 +fi + for ac_prog in openjade jade do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -9948,7 +10021,8 @@ sgml/docbook-dsssl \ sgml/docbook/dsssl/modular \ sgml/docbook/stylesheet/dsssl/modular \ - sgml/docbook/dsssl-stylesheets + sgml/docbook/dsssl-stylesheets \ + sgml/stylesheets/dsssl/docbook do slonac_candidate=$slonac_prefix/$slonac_infix/$slonac_postfix if test -r "$slonac_candidate/html/docbook.dsl" \ @@ -10063,13 +10137,23 @@ done fi - SGMLSPL=$SGMLSPL + + docdir=$docdir + + mandir=$mandir else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi +if test x"$with_perlsharedir" = x""; then + with_perlsharedir="$PG_LIBDIR" +fi + +perlsharedir=$with_perlsharedir + + ac_config_files="$ac_config_files Makefile.global GNUmakefile" @@ -10436,7 +10520,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by postgresql-slony1-engine $as_me HEAD_20051111, which was +This file was extended by postgresql-slony1-engine $as_me HEAD_20051208, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10496,7 +10580,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -postgresql-slony1-engine config.status HEAD_20051111 +postgresql-slony1-engine config.status HEAD_20051208 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -10711,7 +10795,7 @@ s, at LD@,$LD,;t t s, at YFLAGS@,$YFLAGS,;t t s, at LEXFLAGS@,$LEXFLAGS,;t t -s, at HEAD_20051111@,$HEAD_20051111,;t t +s, at HEAD_20051208@,$HEAD_20051208,;t t s, at with_gnu_ld@,$with_gnu_ld,;t t s, at enable_rpath@,$enable_rpath,;t t s, at acx_pthread_config@,$acx_pthread_config,;t t @@ -10732,7 +10816,6 @@ s, at NETSNMP_CFLAGS@,$NETSNMP_CFLAGS,;t t s, at NETSNMP_AGENTLIBS@,$NETSNMP_AGENTLIBS,;t t s, at TOOLSBIN@,$TOOLSBIN,;t t -s, at DOCDIR@,$DOCDIR,;t t s, at SLONYPATH@,$SLONYPATH,;t t s, at HOST_OS@,$HOST_OS,;t t s, at PORTNAME@,$PORTNAME,;t t @@ -10745,11 +10828,14 @@ s, at CONVERT@,$CONVERT,;t t s, at PGAUTODOC@,$PGAUTODOC,;t t s, at NSGMLS@,$NSGMLS,;t t +s, at SGMLSPL@,$SGMLSPL,;t t +s, at d2mdir@,$d2mdir,;t t s, at JADE@,$JADE,;t t s, at have_docbook@,$have_docbook,;t t s, at DOCBOOKSTYLE@,$DOCBOOKSTYLE,;t t s, at COLLATEINDEX@,$COLLATEINDEX,;t t -s, at SGMLSPL@,$SGMLSPL,;t t +s, at docdir@,$docdir,;t t +s, at perlsharedir@,$perlsharedir,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF
- Previous message: [Slony1-commit] By xfade: Man creation fixes.
- Next message: [Slony1-commit] By cbbrowne: Fixed creation of UTF8 table
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list