Changeset 1817


Ignore:
Timestamp:
03/10/12 08:18:33 (15 months ago)
Author:
jtv
Message:

Toolchain fix for OS X. Thanks Torsten Hilgenberg.

Files:
40 edited

Legend:

Unmodified
Added
Removed

  • branches/4.0/ChangeLog

    r1815 r1817  
     12012-02-28  Jeroen T. Vermeulen <jtv@xs4all.nl> 
     2 tools/extract_version: 
     3 - Compatibility fix for OS X.  Thanks Torsten Hilgenberg. 
    142012-01-18  Jeroen T. Vermeulen <jtv@xs4all.nl> 
    25 test/unit/test_prepared_statement.cxx: 

  • branches/4.0/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    7777  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 
    7878  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 
     79am__uninstall_files_from_dir = { \ 
     80  test -z "$$files" \ 
     81    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 
     82    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 
     83         $(am__cd) "$$dir" && rm -f $$files; }; \ 
     84  } 
    7985am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" 
    8086SCRIPTS = $(bin_SCRIPTS) 
    … …  
    103109top_distdir = $(distdir) 
    104110am__remove_distdir = \ 
    105   { test ! -d "$(distdir)" \ 
    106     || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ 
    107          && rm -fr "$(distdir)"; }; } 
     111  if test -d "$(distdir)"; then \ 
     112    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ 
     113      && rm -rf "$(distdir)" \ 
     114      || { sleep 5 && rm -rf "$(distdir)"; }; \ 
     115  else :; fi 
    108116am__relativize = \ 
    109117  dir0=`pwd`; \ 
    … …  
    134142GZIP_ENV = --best 
    135143distuninstallcheck_listfiles = find . -type f -print 
     144am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 
     145  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' 
    136146distcleancheck_listfiles = find . -type f -print 
    137147ACLOCAL = @ACLOCAL@ 
    … …  
    282292 
    283293.SUFFIXES: 
    284 am--refresh: 
     294am--refresh: Makefile 
    285295        @: 
    286296$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps) 
    … …  
    353363        files=`for p in $$list; do echo "$$p"; done | \ 
    354364               sed -e 's,.*/,,;$(transform)'`; \ 
    355         test -n "$$list" || exit 0; \ 
    356         echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ 
    357         cd "$(DESTDIR)$(bindir)" && rm -f $$files 
     365        dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) 
    358366 
    359367mostlyclean-libtool: 
    … …  
    382390        @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ 
    383391        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ 
    384         test -n "$$files" || exit 0; \ 
    385         echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ 
    386         cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files 
     392        dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) 
    387393 
    388394# This directory's subdirectories are mostly independent; you can cd 
    … …  
    602608          dashes=`echo "$$dashes" | sed s/./=/g`; \ 
    603609          if test "$$failed" -eq 0; then \ 
    604             echo "$$grn$$dashes"; \ 
     610            col="$$grn"; \ 
    605611          else \ 
    606             echo "$$red$$dashes"; \ 
    607           fi; \ 
    608           echo "$$banner"; \ 
    609           test -z "$$skipped" || echo "$$skipped"; \ 
    610           test -z "$$report" || echo "$$report"; \ 
    611           echo "$$dashes$$std"; \ 
     612            col="$$red"; \ 
     613          fi; \ 
     614          echo "$${col}$$dashes$${std}"; \ 
     615          echo "$${col}$$banner$${std}"; \ 
     616          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ 
     617          test -z "$$report" || echo "$${col}$$report$${std}"; \ 
     618          echo "$${col}$$dashes$${std}"; \ 
    612619          test "$$failed" -eq 0; \ 
    613620        else :; fi 
    … …  
    685692 
    686693dist-bzip2: distdir 
    687         tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 
     694        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 
     695        $(am__remove_distdir) 
     696 
     697dist-lzip: distdir 
     698        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 
    688699        $(am__remove_distdir) 
    689700 
    … …  
    693704 
    694705dist-xz: distdir 
    695         tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz 
     706        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 
    696707        $(am__remove_distdir) 
    697708 
    … …  
    724735        *.tar.lzma*) \ 
    725736          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ 
     737        *.tar.lz*) \ 
     738          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ 
    726739        *.tar.xz*) \ 
    727740          xz -dc $(distdir).tar.xz | $(am__untar) ;;\ 
    … …  
    743756          && $(am__cd) $(distdir)/_build \ 
    744757          && ../configure --srcdir=.. --prefix="$$dc_install_base" \ 
     758            $(AM_DISTCHECK_CONFIGURE_FLAGS) \ 
    745759            $(DISTCHECK_CONFIGURE_FLAGS) \ 
    746760          && $(MAKE) $(AM_MAKEFLAGS) \ 
    … …  
    771785          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' 
    772786distuninstallcheck: 
    773         @$(am__cd) '$(distuninstallcheck_dir)' \ 
    774         && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ 
     787        @test -n '$(distuninstallcheck_dir)' || { \ 
     788          echo 'ERROR: trying to run $@ with an empty' \ 
     789               '$$(distuninstallcheck_dir)' >&2; \ 
     790          exit 1; \ 
     791        }; \ 
     792        $(am__cd) '$(distuninstallcheck_dir)' || { \ 
     793          echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ 
     794          exit 1; \ 
     795        }; \ 
     796        test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ 
    775797           || { echo "ERROR: files left after uninstall:" ; \ 
    776798                if test -n "$(DESTDIR)"; then \ 
    … …  
    807829installcheck: installcheck-recursive 
    808830install-strip: 
    809         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    810           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    811           `test -z '$(STRIP)' || \ 
    812             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     831        if test -z '$(STRIP)'; then \ 
     832          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     833            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     834              install; \ 
     835        else \ 
     836          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     837            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     838            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     839        fi 
    813840mostlyclean-generic: 
    814841 
    … …  
    899926        all all-am am--refresh check check-TESTS check-am clean \ 
    900927        clean-generic clean-libtool ctags ctags-recursive dist \ 
    901         dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ 
    902         dist-xz dist-zip distcheck distclean distclean-generic \ 
    903         distclean-libtool distclean-tags distcleancheck distdir \ 
    904         distuninstallcheck dvi dvi-am html html-am info info-am \ 
    905         install install-am install-binSCRIPTS install-data \ 
    906         install-data-am install-dvi install-dvi-am install-exec \ 
    907         install-exec-am install-html install-html-am install-info \ 
    908         install-info-am install-man install-pdf install-pdf-am \ 
    909         install-pkgconfigDATA install-ps install-ps-am install-strip \ 
    910         installcheck installcheck-am installdirs installdirs-am \ 
    911         maintainer-clean maintainer-clean-generic mostlyclean \ 
    912         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 
    913         tags tags-recursive uninstall uninstall-am \ 
     928        dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ 
     929        dist-tarZ dist-xz dist-zip distcheck distclean \ 
     930        distclean-generic distclean-libtool distclean-tags \ 
     931        distcleancheck distdir distuninstallcheck dvi dvi-am html \ 
     932        html-am info info-am install install-am install-binSCRIPTS \ 
     933        install-data install-data-am install-dvi install-dvi-am \ 
     934        install-exec install-exec-am install-html install-html-am \ 
     935        install-info install-info-am install-man install-pdf \ 
     936        install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ 
     937        install-strip installcheck installcheck-am installdirs \ 
     938        installdirs-am maintainer-clean maintainer-clean-generic \ 
     939        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ 
     940        ps ps-am tags tags-recursive uninstall uninstall-am \ 
    914941        uninstall-binSCRIPTS uninstall-pkgconfigDATA 
    915942 

  • branches/4.0/NEWS

    r1808 r1817  
     14.0.1 
     2 - Build fix for OS X. 
    134.0 
    24 - API change: noticers are gone!  Use errorhandlers to capture error output. 

  • branches/4.0/VERSION

    r1728 r1817  
    1 PQXX_VERSION    4.0 
     1PQXX_VERSION    4.0.1 

  • branches/4.0/aclocal.m4

    r1808 r1817  
    1 # generated automatically by aclocal 1.11.1 -*- Autoconf -*- 
     1# generated automatically by aclocal 1.11.3 -*- Autoconf -*- 
    22 
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
    4 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc. 
     4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, 
     5# Inc. 
    56# This file is free software; the Free Software Foundation 
    67# gives unlimited permission to copy and/or distribute it, 
    … …  
    2021To do so, use the procedure documented by the package, typically `autoreconf'.])]) 
    2122 
    22 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc. 
    23 # 
    24 # This file is free software; the Free Software Foundation 
    25 # gives unlimited permission to copy and/or distribute it, 
    26 # with or without modifications, as long as this notice is preserved. 
     23# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software 
     24# Foundation, Inc. 
     25# 
     26# This file is free software; the Free Software Foundation 
     27# gives unlimited permission to copy and/or distribute it, 
     28# with or without modifications, as long as this notice is preserved. 
     29 
     30# serial 1 
    2731 
    2832# AM_AUTOMAKE_VERSION(VERSION) 
    … …  
    3539dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 
    3640dnl require some minimum version.  Point them to the right macro. 
    37 m4_if([$1], [1.11.1], [], 
     41m4_if([$1], [1.11.3], [], 
    3842      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 
    3943]) 
    … …  
    5155# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 
    5256AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 
    53 [AM_AUTOMAKE_VERSION([1.11.1])dnl 
     57[AM_AUTOMAKE_VERSION([1.11.3])dnl 
    5458m4_ifndef([AC_AUTOCONF_VERSION], 
    5559  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 
    … …  
    5862# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*- 
    5963 
    60 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc. 
    61 # 
    62 # This file is free software; the Free Software Foundation 
    63 # gives unlimited permission to copy and/or distribute it, 
    64 # with or without modifications, as long as this notice is preserved. 
     64# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. 
     65# 
     66# This file is free software; the Free Software Foundation 
     67# gives unlimited permission to copy and/or distribute it, 
     68# with or without modifications, as long as this notice is preserved. 
     69 
     70# serial 1 
    6571 
    6672# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets 
    … …  
    145151fi])]) 
    146152 
    147 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 
    148 # Free Software Foundation, Inc. 
    149 # 
    150 # This file is free software; the Free Software Foundation 
    151 # gives unlimited permission to copy and/or distribute it, 
    152 # with or without modifications, as long as this notice is preserved. 
    153  
    154 # serial 10 
     153# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 
     154# 2010, 2011 Free Software Foundation, Inc. 
     155# 
     156# This file is free software; the Free Software Foundation 
     157# gives unlimited permission to copy and/or distribute it, 
     158# with or without modifications, as long as this notice is preserved. 
     159 
     160# serial 12 
    155161 
    156162# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be 
    … …  
    192198  # making a dummy file named `D' -- because `-MD' means `put the output 
    193199  # in D'. 
     200  rm -rf conftest.dir 
    194201  mkdir conftest.dir 
    195202  # Copy depcomp to subdir because otherwise we won't find it if we're 
    … …  
    256263      fi 
    257264      ;; 
    258     msvisualcpp | msvcmsys) 
     265    msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    259266      # This compiler won't grok `-c -o', but also, the minuso test has 
    260267      # not run yet.  These depmodes are late enough in the game, and 
    … …  
    321328  am_depcomp="$ac_aux_dir/depcomp" 
    322329  AMDEPBACKSLASH='\' 
     330  am__nodep='_no' 
    323331fi 
    324332AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) 
    325333AC_SUBST([AMDEPBACKSLASH])dnl 
    326334_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl 
     335AC_SUBST([am__nodep])dnl 
     336_AM_SUBST_NOTMAKE([am__nodep])dnl 
    327337]) 
    328338 
    … …  
    546556echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 
    547557 
    548 # Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc. 
    549 # 
    550 # This file is free software; the Free Software Foundation 
    551 # gives unlimited permission to copy and/or distribute it, 
    552 # with or without modifications, as long as this notice is preserved. 
     558# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, 
     559# Inc. 
     560# 
     561# This file is free software; the Free Software Foundation 
     562# gives unlimited permission to copy and/or distribute it, 
     563# with or without modifications, as long as this notice is preserved. 
     564 
     565# serial 1 
    553566 
    554567# AM_PROG_INSTALL_SH 
    … …  
    591604# From Jim Meyering 
    592605 
    593 # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 
    594 # Free Software Foundation, Inc. 
     606# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 
     607# 2011 Free Software Foundation, Inc. 
    595608# 
    596609# This file is free software; the Free Software Foundation 
    … …  
    612625       [m4_define([am_maintainer_other], [enable]) 
    613626        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) 
    614 AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) 
     627AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) 
    615628  dnl maintainer-mode's default is 'disable' unless 'enable' is passed 
    616629  AC_ARG_ENABLE([maintainer-mode], 
    … …  
    723736]) 
    724737 
    725 # Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
    726 # 
    727 # This file is free software; the Free Software Foundation 
    728 # gives unlimited permission to copy and/or distribute it, 
    729 # with or without modifications, as long as this notice is preserved. 
     738# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, 
     739# Inc. 
     740# 
     741# This file is free software; the Free Software Foundation 
     742# gives unlimited permission to copy and/or distribute it, 
     743# with or without modifications, as long as this notice is preserved. 
     744 
     745# serial 1 
    730746 
    731747# AM_PROG_MKDIR_P 
    … …  
    751767# Helper functions for option handling.                     -*- Autoconf -*- 
    752768 
    753 # Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc. 
    754 # 
    755 # This file is free software; the Free Software Foundation 
    756 # gives unlimited permission to copy and/or distribute it, 
    757 # with or without modifications, as long as this notice is preserved. 
    758  
    759 # serial 4 
     769# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software 
     770# Foundation, Inc. 
     771# 
     772# This file is free software; the Free Software Foundation 
     773# gives unlimited permission to copy and/or distribute it, 
     774# with or without modifications, as long as this notice is preserved. 
     775 
     776# serial 5 
    760777 
    761778# _AM_MANGLE_OPTION(NAME) 
    … …  
    765782 
    766783# _AM_SET_OPTION(NAME) 
    767 # ------------------------------ 
     784# -------------------- 
    768785# Set option NAME.  Presently that only means defining a flag for this option. 
    769786AC_DEFUN([_AM_SET_OPTION], 
    … …  
    771788 
    772789# _AM_SET_OPTIONS(OPTIONS) 
    773 # ---------------------------------- 
     790# ------------------------ 
    774791# OPTIONS is a space-separated list of Automake options. 
    775792AC_DEFUN([_AM_SET_OPTIONS], 
    … …  
    847864AC_MSG_RESULT(yes)]) 
    848865 
    849 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc. 
    850 # 
    851 # This file is free software; the Free Software Foundation 
    852 # gives unlimited permission to copy and/or distribute it, 
    853 # with or without modifications, as long as this notice is preserved. 
     866# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. 
     867# 
     868# This file is free software; the Free Software Foundation 
     869# gives unlimited permission to copy and/or distribute it, 
     870# with or without modifications, as long as this notice is preserved. 
     871 
     872# serial 1 
    854873 
    855874# AM_PROG_INSTALL_STRIP 
    … …  
    875894AC_SUBST([INSTALL_STRIP_PROGRAM])]) 
    876895 
    877 # Copyright (C) 2006, 2008  Free Software Foundation, Inc. 
    878 # 
    879 # This file is free software; the Free Software Foundation 
    880 # gives unlimited permission to copy and/or distribute it, 
    881 # with or without modifications, as long as this notice is preserved. 
    882  
    883 # serial 2 
     896# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. 
     897# 
     898# This file is free software; the Free Software Foundation 
     899# gives unlimited permission to copy and/or distribute it, 
     900# with or without modifications, as long as this notice is preserved. 
     901 
     902# serial 3 
    884903 
    885904# _AM_SUBST_NOTMAKE(VARIABLE) 
    … …  
    890909 
    891910# AM_SUBST_NOTMAKE(VARIABLE) 
    892 # --------------------------- 
     911# -------------------------- 
    893912# Public sister of _AM_SUBST_NOTMAKE. 
    894913AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) 
    … …  
    896915# Check how to create a tarball.                            -*- Autoconf -*- 
    897916 
    898 # Copyright (C) 2004, 2005  Free Software Foundation, Inc. 
     917# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. 
    899918# 
    900919# This file is free software; the Free Software Foundation 
    … …  
    918937#     $(am__untar) < result.tar 
    919938AC_DEFUN([_AM_PROG_TAR], 
    920 [# Always define AMTAR for backward compatibility. 
    921 AM_MISSING_PROG([AMTAR], [tar]) 
     939[# Always define AMTAR for backward compatibility.  Yes, it's still used 
     940# in the wild :-(  We should find a proper way to deprecate it ... 
     941AC_SUBST([AMTAR], ['$${TAR-tar}']) 
    922942m4_if([$1], [v7], 
    923      [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], 
     943     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], 
    924944     [m4_case([$1], [ustar],, [pax],, 
    925945              [m4_fatal([Unknown tar format])]) 

  • branches/4.0/config/Makefile.in

    r1748 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    283283installcheck: installcheck-am 
    284284install-strip: 
    285         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    286           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    287           `test -z '$(STRIP)' || \ 
    288             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     285        if test -z '$(STRIP)'; then \ 
     286          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     287            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     288              install; \ 
     289        else \ 
     290          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     291            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     292            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     293        fi 
    289294mostlyclean-generic: 
    290295 

  • branches/4.0/configure

    r1816 r1817  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.68 for libpqxx 4.0. 
     3# Generated by GNU Autoconf 2.68 for libpqxx 4.0.1. 
    44# 
    55# Report bugs to <Jeroen T. Vermeulen <jtv@xs4all.nl>>. 
    … …  
    571571PACKAGE_NAME='libpqxx' 
    572572PACKAGE_TARNAME='libpqxx' 
    573 PACKAGE_VERSION='4.0' 
    574 PACKAGE_STRING='libpqxx 4.0' 
     573PACKAGE_VERSION='4.0.1' 
     574PACKAGE_STRING='libpqxx 4.0.1' 
    575575PACKAGE_BUGREPORT='Jeroen T. Vermeulen <jtv@xs4all.nl>' 
    576576PACKAGE_URL='' 
    … …  
    675675am__fastdepCXX_TRUE 
    676676CXXDEPMODE 
     677am__nodep 
    677678AMDEPBACKSLASH 
    678679AMDEP_FALSE 
    … …  
    13241325  # This message is too long to be a string in the A/UX 3.1 sh. 
    13251326  cat <<_ACEOF 
    1326 \`configure' configures libpqxx 4.0 to adapt to many kinds of systems. 
     1327\`configure' configures libpqxx 4.0.1 to adapt to many kinds of systems. 
    13271328 
    13281329Usage: $0 [OPTION]... [VAR=VALUE]... 
    … …  
    13941395if test -n "$ac_init_help"; then 
    13951396  case $ac_init_help in 
    1396      short | recursive ) echo "Configuration of libpqxx 4.0:";; 
     1397     short | recursive ) echo "Configuration of libpqxx 4.0.1:";; 
    13971398   esac 
    13981399  cat <<\_ACEOF 
    … …  
    15041505if $ac_init_version; then 
    15051506  cat <<\_ACEOF 
    1506 libpqxx configure 4.0 
     1507libpqxx configure 4.0.1 
    15071508generated by GNU Autoconf 2.68 
    15081509 
    … …  
    20362037running configure, to aid debugging if configure makes a mistake. 
    20372038 
    2038 It was created by libpqxx $as_me 4.0, which was 
     2039It was created by libpqxx $as_me 4.0.1, which was 
    20392040generated by GNU Autoconf 2.68.  Invocation command line was 
    20402041 
    … …  
    28582859# Define the identity of the package. 
    28592860 PACKAGE=libpqxx 
    2860  VERSION=4.0 
     2861 VERSION=4.0.1 
    28612862 
    28622863 
    … …  
    28882889# We need awk for the "check" target.  The system "awk" is bad on 
    28892890# some platforms. 
    2890 # Always define AMTAR for backward compatibility. 
    2891  
    2892 AMTAR=${AMTAR-"${am_missing_run}tar"} 
    2893  
    2894 am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' 
    2895  
    2896  
    2897  
    2898  
    2899  
    2900  
    2901 PQXXVERSION=4.0 
     2891# Always define AMTAR for backward compatibility.  Yes, it's still used 
     2892# in the wild :-(  We should find a proper way to deprecate it ... 
     2893AMTAR='$${TAR-tar}' 
     2894 
     2895am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' 
     2896 
     2897 
     2898 
     2899 
     2900 
     2901 
     2902PQXXVERSION=4.0.1 
    29022903PQXX_ABI=4.0 
    29032904PQXX_MAJOR=4 
    … …  
    34743475  am_depcomp="$ac_aux_dir/depcomp" 
    34753476  AMDEPBACKSLASH='\' 
     3477  am__nodep='_no' 
    34763478fi 
    34773479 if test "x$enable_dependency_tracking" != xno; then 
    … …  
    34983500  # making a dummy file named `D' -- because `-MD' means `put the output 
    34993501  # in D'. 
     3502  rm -rf conftest.dir 
    35003503  mkdir conftest.dir 
    35013504  # Copy depcomp to subdir because otherwise we won't find it if we're 
    … …  
    35573560      fi 
    35583561      ;; 
    3559     msvisualcpp | msvcmsys) 
     3562    msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    35603563      # This compiler won't grok `-c -o', but also, the minuso test has 
    35613564      # not run yet.  These depmodes are late enough in the game, and 
    … …  
    41654168  # making a dummy file named `D' -- because `-MD' means `put the output 
    41664169  # in D'. 
     4170  rm -rf conftest.dir 
    41674171  mkdir conftest.dir 
    41684172  # Copy depcomp to subdir because otherwise we won't find it if we're 
    … …  
    42244228      fi 
    42254229      ;; 
    4226     msvisualcpp | msvcmsys) 
     4230    msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    42274231      # This compiler won't grok `-c -o', but also, the minuso test has 
    42284232      # not run yet.  These depmodes are late enough in the game, and 
    … …  
    1641316417failed to link properly to the libpq library.  This may be because the libpq 
    1641416418library file is damaged, or in some incorrect format. or if your libpq is much 
    16415 more recent than libpqxx version 4.0, perhaps libpq has undergone a 
     16419more recent than libpqxx version 4.0.1, perhaps libpq has undergone a 
    1641616420radical ABI change. 
    1641716421 
    … …  
    1819318197# values after options handling. 
    1819418198ac_log=" 
    18195 This file was extended by libpqxx $as_me 4.0, which was 
     18199This file was extended by libpqxx $as_me 4.0.1, which was 
    1819618200generated by GNU Autoconf 2.68.  Invocation command line was 
    1819718201 
    … …  
    1825918263ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
    1826018264ac_cs_version="\\ 
    18261 libpqxx config.status 4.0 
     18265libpqxx config.status 4.0.1 
    1826218266configured by $0, generated by GNU Autoconf 2.68, 
    1826318267  with options \\"\$ac_cs_config\\" 

  • branches/4.0/configure.ac

    r1808 r1817  
    1212 
    1313AC_PREREQ(2.59) 
    14 AC_INIT(libpqxx, 4.0, [Jeroen T. Vermeulen <jtv@xs4all.nl>]) 
     14AC_INIT(libpqxx, 4.0.1, [Jeroen T. Vermeulen <jtv@xs4all.nl>]) 
    1515AC_LANG(C++) 
    1616AC_CONFIG_AUX_DIR(config) 
    1717AC_CONFIG_MACRO_DIR([config/m4]) 
    18 AM_INIT_AUTOMAKE(libpqxx, 4.0) 
    19  
    20 PQXXVERSION=4.0 
     18AM_INIT_AUTOMAKE(libpqxx, 4.0.1) 
     19 
     20PQXXVERSION=4.0.1 
    2121PQXX_ABI=4.0 
    2222PQXX_MAJOR=4 
    … …  
    459459failed to link properly to the libpq library.  This may be because the libpq 
    460460library file is damaged, or in some incorrect format. or if your libpq is much 
    461 more recent than libpqxx version 4.0, perhaps libpq has undergone a 
     461more recent than libpqxx version 4.0.1, perhaps libpq has undergone a 
    462462radical ABI change. 
    463463 

  • branches/4.0/debian/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    302302installcheck: installcheck-am 
    303303install-strip: 
    304         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    305           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    306           `test -z '$(STRIP)' || \ 
    307             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     304        if test -z '$(STRIP)'; then \ 
     305          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     306            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     307              install; \ 
     308        else \ 
     309          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     310            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     311            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     312        fi 
    308313mostlyclean-generic: 
    309314 

  • branches/4.0/debian/changelog

    r1808 r1817  
     1libpqxx (4.0.1-1) unstable; urgency=low 
     2 
     3  * Build fix for OS X.  Thanks Torsten Hilgenberg. 
     4 
     5 -- Jeroen T. Vermeulen <jtv@xs4all.nl>  Tue, 28 Feb 2012 19:16:00 +0700 
     6 
    17libpqxx (4.0-1) unstable; urgency=medium 
    28 

  • branches/4.0/doc/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    291291installcheck: installcheck-am 
    292292install-strip: 
    293         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    294           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    295           `test -z '$(STRIP)' || \ 
    296             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     293        if test -z '$(STRIP)'; then \ 
     294          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     295            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     296              install; \ 
     297        else \ 
     298          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     299            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     300            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     301        fi 
    297302mostlyclean-generic: 
    298303 

  • branches/4.0/include/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    8181  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 
    8282  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 
     83am__uninstall_files_from_dir = { \ 
     84  test -z "$$files" \ 
     85    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 
     86    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 
     87         $(am__cd) "$$dir" && rm -f $$files; }; \ 
     88  } 
    8389am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" 
    8490HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS) 
    … …  
    374380        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ 
    375381        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ 
    376         test -n "$$files" || exit 0; \ 
    377         echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ 
    378         cd "$(DESTDIR)$(includedir)" && rm -f $$files 
     382        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) 
    379383install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS) 
    380384        @$(NORMAL_INSTALL) 
    … …  
    397401        @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ 
    398402        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ 
    399         test -n "$$files" || exit 0; \ 
    400         echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ 
    401         cd "$(DESTDIR)$(includedir)" && rm -f $$files 
     403        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) 
    402404 
    403405# This directory's subdirectories are mostly independent; you can cd 
    … …  
    612614installcheck: installcheck-recursive 
    613615install-strip: 
    614         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    615           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    616           `test -z '$(STRIP)' || \ 
    617             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     616        if test -z '$(STRIP)'; then \ 
     617          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     618            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     619              install; \ 
     620        else \ 
     621          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     622            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     623            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     624        fi 
    618625mostlyclean-generic: 
    619626 

  • branches/4.0/include/pqxx/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    242242 
    243243config.h: stamp-h1 
    244         @if test ! -f $@; then \ 
    245           rm -f stamp-h1; \ 
    246           $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ 
    247         else :; fi 
     244        @if test ! -f $@; then rm -f stamp-h1; else :; fi 
     245        @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi 
    248246 
    249247stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status 
    … …  
    360358installcheck: installcheck-am 
    361359install-strip: 
    362         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    363           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    364           `test -z '$(STRIP)' || \ 
    365             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     360        if test -z '$(STRIP)'; then \ 
     361          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     362            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     363              install; \ 
     364        else \ 
     365          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     366            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     367            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     368        fi 
    366369mostlyclean-generic: 
    367370 

  • branches/4.0/include/pqxx/version.hxx

    r1736 r1817  
    1919 
    2020/// Full libpqxx version string. 
    21 #define PQXX_VERSION "4.0" 
     21#define PQXX_VERSION "4.0.1" 
    2222 
    2323/// Major version number for this libpqxx release. 

  • branches/4.0/src/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    7171  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 
    7272  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 
     73am__uninstall_files_from_dir = { \ 
     74  test -z "$$files" \ 
     75    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 
     76    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 
     77         $(am__cd) "$$dir" && rm -f $$files; }; \ 
     78  } 
    7379am__installdirs = "$(DESTDIR)$(libdir)" 
    7480LTLIBRARIES = $(lib_LTLIBRARIES) 
    … …  
    339345          rm -f "$${dir}/so_locations"; \ 
    340346        done 
    341 libpqxx.la: $(libpqxx_la_OBJECTS) $(libpqxx_la_DEPENDENCIES)  
     347libpqxx.la: $(libpqxx_la_OBJECTS) $(libpqxx_la_DEPENDENCIES) $(EXTRA_libpqxx_la_DEPENDENCIES)  
    342348        $(libpqxx_la_LINK) -rpath $(libdir) $(libpqxx_la_OBJECTS) $(libpqxx_la_LIBADD) $(LIBS) 
    343349 
    … …  
    501507installcheck: installcheck-am 
    502508install-strip: 
    503         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    504           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    505           `test -z '$(STRIP)' || \ 
    506             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     509        if test -z '$(STRIP)'; then \ 
     510          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     511            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     512              install; \ 
     513        else \ 
     514          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     515            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     516            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     517        fi 
    507518mostlyclean-generic: 
    508519 

  • branches/4.0/test/Makefile.in

    r1811 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    421421        echo " rm -f" $$list; \ 
    422422        rm -f $$list 
    423 runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES)  
     423runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDENCIES)  
    424424        @rm -f runner$(EXEEXT) 
    425425        $(CXXLINK) $(runner_OBJECTS) $(runner_LDADD) $(LIBS) 
    … …  
    747747          dashes=`echo "$$dashes" | sed s/./=/g`; \ 
    748748          if test "$$failed" -eq 0; then \ 
    749             echo "$$grn$$dashes"; \ 
     749            col="$$grn"; \ 
    750750          else \ 
    751             echo "$$red$$dashes"; \ 
    752           fi; \ 
    753           echo "$$banner"; \ 
    754           test -z "$$skipped" || echo "$$skipped"; \ 
    755           test -z "$$report" || echo "$$report"; \ 
    756           echo "$$dashes$$std"; \ 
     751            col="$$red"; \ 
     752          fi; \ 
     753          echo "$${col}$$dashes$${std}"; \ 
     754          echo "$${col}$$banner$${std}"; \ 
     755          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ 
     756          test -z "$$report" || echo "$${col}$$report$${std}"; \ 
     757          echo "$${col}$$dashes$${std}"; \ 
    757758          test "$$failed" -eq 0; \ 
    758759        else :; fi 
    … …  
    833834installcheck: installcheck-recursive 
    834835install-strip: 
    835         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    836           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    837           `test -z '$(STRIP)' || \ 
    838             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     836        if test -z '$(STRIP)'; then \ 
     837          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     838            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     839              install; \ 
     840        else \ 
     841          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     842            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     843            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     844        fi 
    839845mostlyclean-generic: 
    840846 

  • branches/4.0/test/unit/Makefile.in

    r1811 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    304304        echo " rm -f" $$list; \ 
    305305        rm -f $$list 
    306 runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES)  
     306runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDENCIES)  
    307307        @rm -f runner$(EXEEXT) 
    308308        $(CXXLINK) $(runner_OBJECTS) $(runner_LDADD) $(LIBS) 
    … …  
    495495          dashes=`echo "$$dashes" | sed s/./=/g`; \ 
    496496          if test "$$failed" -eq 0; then \ 
    497             echo "$$grn$$dashes"; \ 
     497            col="$$grn"; \ 
    498498          else \ 
    499             echo "$$red$$dashes"; \ 
     499            col="$$red"; \ 
    500500          fi; \ 
    501           echo "$$banner"; \ 
    502           test -z "$$skipped" || echo "$$skipped"; \ 
    503           test -z "$$report" || echo "$$report"; \ 
    504           echo "$$dashes$$std"; \ 
     501          echo "$${col}$$dashes$${std}"; \ 
     502          echo "$${col}$$banner$${std}"; \ 
     503          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ 
     504          test -z "$$report" || echo "$${col}$$report$${std}"; \ 
     505          echo "$${col}$$dashes$${std}"; \ 
    505506          test "$$failed" -eq 0; \ 
    506507        else :; fi 
    … …  
    552553installcheck: installcheck-am 
    553554install-strip: 
    554         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    555           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    556           `test -z '$(STRIP)' || \ 
    557             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     555        if test -z '$(STRIP)'; then \ 
     556          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     557            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     558              install; \ 
     559        else \ 
     560          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     561            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     562            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     563        fi 
    558564mostlyclean-generic: 
    559565 

  • branches/4.0/tools/Makefile.in

    r1813 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    272272        echo " rm -f" $$list; \ 
    273273        rm -f $$list 
    274 pqxxthreadsafety$(EXEEXT): $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_DEPENDENCIES)  
     274pqxxthreadsafety$(EXEEXT): $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_DEPENDENCIES) $(EXTRA_pqxxthreadsafety_DEPENDENCIES)  
    275275        @rm -f pqxxthreadsafety$(EXEEXT) 
    276276        $(CXXLINK) $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_LDADD) $(LIBS) 
    277 rmlo$(EXEEXT): $(rmlo_OBJECTS) $(rmlo_DEPENDENCIES)  
     277rmlo$(EXEEXT): $(rmlo_OBJECTS) $(rmlo_DEPENDENCIES) $(EXTRA_rmlo_DEPENDENCIES)  
    278278        @rm -f rmlo$(EXEEXT) 
    279279        $(CXXLINK) $(rmlo_OBJECTS) $(rmlo_LDADD) $(LIBS) 
    … …  
    411411installcheck: installcheck-am 
    412412install-strip: 
    413         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    414           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    415           `test -z '$(STRIP)' || \ 
    416             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     413        if test -z '$(STRIP)'; then \ 
     414          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     415            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     416              install; \ 
     417        else \ 
     418          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     419            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     420            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     421        fi 
    417422mostlyclean-generic: 
    418423 

  • branches/4.0/tools/extract_version

    r1546 r1817  
    3434get_version() { 
    3535        grep -w 'PQXX_VERSION' VERSION | 
    36                 sed -e 's/^[[:space:]A-Z_]*\([^[:space:]#]\+\).*$/\1/' 
     36                sed -E -e 's/^[[:space:]A-Z_]*([^[:space:]#]+).*$/\1/' 
    3737} 
    3838 

  • branches/4.0/win32/Makefile.in

    r1808 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    288288installcheck: installcheck-am 
    289289install-strip: 
    290         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    291           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    292           `test -z '$(STRIP)' || \ 
    293             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     290        if test -z '$(STRIP)'; then \ 
     291          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     292            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     293              install; \ 
     294        else \ 
     295          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     296            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     297            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     298        fi 
    294299mostlyclean-generic: 
    295300 

  • trunk/ChangeLog

    r1815 r1817  
     12012-02-28  Jeroen T. Vermeulen <jtv@xs4all.nl> 
     2 tools/extract_version: 
     3 - Compatibility fix for OS X.  Thanks Torsten Hilgenberg. 
    142012-01-18  Jeroen T. Vermeulen <jtv@xs4all.nl> 
    25 test/unit/test_prepared_statement.cxx: 

  • trunk/Makefile.in

    r1748 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    7777  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 
    7878  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 
     79am__uninstall_files_from_dir = { \ 
     80  test -z "$$files" \ 
     81    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 
     82    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 
     83         $(am__cd) "$$dir" && rm -f $$files; }; \ 
     84  } 
    7985am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" 
    8086SCRIPTS = $(bin_SCRIPTS) 
    … …  
    103109top_distdir = $(distdir) 
    104110am__remove_distdir = \ 
    105   { test ! -d "$(distdir)" \ 
    106     || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ 
    107          && rm -fr "$(distdir)"; }; } 
     111  if test -d "$(distdir)"; then \ 
     112    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ 
     113      && rm -rf "$(distdir)" \ 
     114      || { sleep 5 && rm -rf "$(distdir)"; }; \ 
     115  else :; fi 
    108116am__relativize = \ 
    109117  dir0=`pwd`; \ 
    … …  
    134142GZIP_ENV = --best 
    135143distuninstallcheck_listfiles = find . -type f -print 
     144am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 
     145  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' 
    136146distcleancheck_listfiles = find . -type f -print 
    137147ACLOCAL = @ACLOCAL@ 
    … …  
    282292 
    283293.SUFFIXES: 
    284 am--refresh: 
     294am--refresh: Makefile 
    285295        @: 
    286296$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps) 
    … …  
    353363        files=`for p in $$list; do echo "$$p"; done | \ 
    354364               sed -e 's,.*/,,;$(transform)'`; \ 
    355         test -n "$$list" || exit 0; \ 
    356         echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ 
    357         cd "$(DESTDIR)$(bindir)" && rm -f $$files 
     365        dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) 
    358366 
    359367mostlyclean-libtool: 
    … …  
    382390        @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ 
    383391        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ 
    384         test -n "$$files" || exit 0; \ 
    385         echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ 
    386         cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files 
     392        dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) 
    387393 
    388394# This directory's subdirectories are mostly independent; you can cd 
    … …  
    602608          dashes=`echo "$$dashes" | sed s/./=/g`; \ 
    603609          if test "$$failed" -eq 0; then \ 
    604             echo "$$grn$$dashes"; \ 
     610            col="$$grn"; \ 
    605611          else \ 
    606             echo "$$red$$dashes"; \ 
    607           fi; \ 
    608           echo "$$banner"; \ 
    609           test -z "$$skipped" || echo "$$skipped"; \ 
    610           test -z "$$report" || echo "$$report"; \ 
    611           echo "$$dashes$$std"; \ 
     612            col="$$red"; \ 
     613          fi; \ 
     614          echo "$${col}$$dashes$${std}"; \ 
     615          echo "$${col}$$banner$${std}"; \ 
     616          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ 
     617          test -z "$$report" || echo "$${col}$$report$${std}"; \ 
     618          echo "$${col}$$dashes$${std}"; \ 
    612619          test "$$failed" -eq 0; \ 
    613620        else :; fi 
    … …  
    685692 
    686693dist-bzip2: distdir 
    687         tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 
     694        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 
     695        $(am__remove_distdir) 
     696 
     697dist-lzip: distdir 
     698        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 
    688699        $(am__remove_distdir) 
    689700 
    … …  
    693704 
    694705dist-xz: distdir 
    695         tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz 
     706        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 
    696707        $(am__remove_distdir) 
    697708 
    … …  
    724735        *.tar.lzma*) \ 
    725736          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ 
     737        *.tar.lz*) \ 
     738          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ 
    726739        *.tar.xz*) \ 
    727740          xz -dc $(distdir).tar.xz | $(am__untar) ;;\ 
    … …  
    743756          && $(am__cd) $(distdir)/_build \ 
    744757          && ../configure --srcdir=.. --prefix="$$dc_install_base" \ 
     758            $(AM_DISTCHECK_CONFIGURE_FLAGS) \ 
    745759            $(DISTCHECK_CONFIGURE_FLAGS) \ 
    746760          && $(MAKE) $(AM_MAKEFLAGS) \ 
    … …  
    771785          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' 
    772786distuninstallcheck: 
    773         @$(am__cd) '$(distuninstallcheck_dir)' \ 
    774         && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ 
     787        @test -n '$(distuninstallcheck_dir)' || { \ 
     788          echo 'ERROR: trying to run $@ with an empty' \ 
     789               '$$(distuninstallcheck_dir)' >&2; \ 
     790          exit 1; \ 
     791        }; \ 
     792        $(am__cd) '$(distuninstallcheck_dir)' || { \ 
     793          echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ 
     794          exit 1; \ 
     795        }; \ 
     796        test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ 
    775797           || { echo "ERROR: files left after uninstall:" ; \ 
    776798                if test -n "$(DESTDIR)"; then \ 
    … …  
    807829installcheck: installcheck-recursive 
    808830install-strip: 
    809         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    810           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    811           `test -z '$(STRIP)' || \ 
    812             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     831        if test -z '$(STRIP)'; then \ 
     832          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     833            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     834              install; \ 
     835        else \ 
     836          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     837            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     838            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     839        fi 
    813840mostlyclean-generic: 
    814841 
    … …  
    899926        all all-am am--refresh check check-TESTS check-am clean \ 
    900927        clean-generic clean-libtool ctags ctags-recursive dist \ 
    901         dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ 
    902         dist-xz dist-zip distcheck distclean distclean-generic \ 
    903         distclean-libtool distclean-tags distcleancheck distdir \ 
    904         distuninstallcheck dvi dvi-am html html-am info info-am \ 
    905         install install-am install-binSCRIPTS install-data \ 
    906         install-data-am install-dvi install-dvi-am install-exec \ 
    907         install-exec-am install-html install-html-am install-info \ 
    908         install-info-am install-man install-pdf install-pdf-am \ 
    909         install-pkgconfigDATA install-ps install-ps-am install-strip \ 
    910         installcheck installcheck-am installdirs installdirs-am \ 
    911         maintainer-clean maintainer-clean-generic mostlyclean \ 
    912         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 
    913         tags tags-recursive uninstall uninstall-am \ 
     928        dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ 
     929        dist-tarZ dist-xz dist-zip distcheck distclean \ 
     930        distclean-generic distclean-libtool distclean-tags \ 
     931        distcleancheck distdir distuninstallcheck dvi dvi-am html \ 
     932        html-am info info-am install install-am install-binSCRIPTS \ 
     933        install-data install-data-am install-dvi install-dvi-am \ 
     934        install-exec install-exec-am install-html install-html-am \ 
     935        install-info install-info-am install-man install-pdf \ 
     936        install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ 
     937        install-strip installcheck installcheck-am installdirs \ 
     938        installdirs-am maintainer-clean maintainer-clean-generic \ 
     939        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ 
     940        ps ps-am tags tags-recursive uninstall uninstall-am \ 
    914941        uninstall-binSCRIPTS uninstall-pkgconfigDATA 
    915942 

  • trunk/NEWS

    r1792 r1817  
     15.0 
     2 - Build fix for OS X. 
    134.0 
    24 - API change: noticers are gone!  Use errorhandlers to capture error output. 

  • trunk/VERSION

    r1728 r1817  
    1 PQXX_VERSION    4.0 
     1PQXX_VERSION    5.0 

  • trunk/aclocal.m4

    r1748 r1817  
    1 # generated automatically by aclocal 1.11.1 -*- Autoconf -*- 
     1# generated automatically by aclocal 1.11.3 -*- Autoconf -*- 
    22 
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
    4 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc. 
     4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, 
     5# Inc. 
    56# This file is free software; the Free Software Foundation 
    67# gives unlimited permission to copy and/or distribute it, 
    … …  
    2021To do so, use the procedure documented by the package, typically `autoreconf'.])]) 
    2122 
    22 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc. 
    23 # 
    24 # This file is free software; the Free Software Foundation 
    25 # gives unlimited permission to copy and/or distribute it, 
    26 # with or without modifications, as long as this notice is preserved. 
     23# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software 
     24# Foundation, Inc. 
     25# 
     26# This file is free software; the Free Software Foundation 
     27# gives unlimited permission to copy and/or distribute it, 
     28# with or without modifications, as long as this notice is preserved. 
     29 
     30# serial 1 
    2731 
    2832# AM_AUTOMAKE_VERSION(VERSION) 
    … …  
    3539dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 
    3640dnl require some minimum version.  Point them to the right macro. 
    37 m4_if([$1], [1.11.1], [], 
     41m4_if([$1], [1.11.3], [], 
    3842      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 
    3943]) 
    … …  
    5155# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 
    5256AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 
    53 [AM_AUTOMAKE_VERSION([1.11.1])dnl 
     57[AM_AUTOMAKE_VERSION([1.11.3])dnl 
    5458m4_ifndef([AC_AUTOCONF_VERSION], 
    5559  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 
    … …  
    5862# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*- 
    5963 
    60 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc. 
    61 # 
    62 # This file is free software; the Free Software Foundation 
    63 # gives unlimited permission to copy and/or distribute it, 
    64 # with or without modifications, as long as this notice is preserved. 
     64# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. 
     65# 
     66# This file is free software; the Free Software Foundation 
     67# gives unlimited permission to copy and/or distribute it, 
     68# with or without modifications, as long as this notice is preserved. 
     69 
     70# serial 1 
    6571 
    6672# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets 
    … …  
    145151fi])]) 
    146152 
    147 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 
    148 # Free Software Foundation, Inc. 
    149 # 
    150 # This file is free software; the Free Software Foundation 
    151 # gives unlimited permission to copy and/or distribute it, 
    152 # with or without modifications, as long as this notice is preserved. 
    153  
    154 # serial 10 
     153# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 
     154# 2010, 2011 Free Software Foundation, Inc. 
     155# 
     156# This file is free software; the Free Software Foundation 
     157# gives unlimited permission to copy and/or distribute it, 
     158# with or without modifications, as long as this notice is preserved. 
     159 
     160# serial 12 
    155161 
    156162# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be 
    … …  
    192198  # making a dummy file named `D' -- because `-MD' means `put the output 
    193199  # in D'. 
     200  rm -rf conftest.dir 
    194201  mkdir conftest.dir 
    195202  # Copy depcomp to subdir because otherwise we won't find it if we're 
    … …  
    256263      fi 
    257264      ;; 
    258     msvisualcpp | msvcmsys) 
     265    msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    259266      # This compiler won't grok `-c -o', but also, the minuso test has 
    260267      # not run yet.  These depmodes are late enough in the game, and 
    … …  
    321328  am_depcomp="$ac_aux_dir/depcomp" 
    322329  AMDEPBACKSLASH='\' 
     330  am__nodep='_no' 
    323331fi 
    324332AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) 
    325333AC_SUBST([AMDEPBACKSLASH])dnl 
    326334_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl 
     335AC_SUBST([am__nodep])dnl 
     336_AM_SUBST_NOTMAKE([am__nodep])dnl 
    327337]) 
    328338 
    … …  
    546556echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 
    547557 
    548 # Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc. 
    549 # 
    550 # This file is free software; the Free Software Foundation 
    551 # gives unlimited permission to copy and/or distribute it, 
    552 # with or without modifications, as long as this notice is preserved. 
     558# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, 
     559# Inc. 
     560# 
     561# This file is free software; the Free Software Foundation 
     562# gives unlimited permission to copy and/or distribute it, 
     563# with or without modifications, as long as this notice is preserved. 
     564 
     565# serial 1 
    553566 
    554567# AM_PROG_INSTALL_SH 
    … …  
    591604# From Jim Meyering 
    592605 
    593 # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 
    594 # Free Software Foundation, Inc. 
     606# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 
     607# 2011 Free Software Foundation, Inc. 
    595608# 
    596609# This file is free software; the Free Software Foundation 
    … …  
    612625       [m4_define([am_maintainer_other], [enable]) 
    613626        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) 
    614 AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) 
     627AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) 
    615628  dnl maintainer-mode's default is 'disable' unless 'enable' is passed 
    616629  AC_ARG_ENABLE([maintainer-mode], 
    … …  
    723736]) 
    724737 
    725 # Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
    726 # 
    727 # This file is free software; the Free Software Foundation 
    728 # gives unlimited permission to copy and/or distribute it, 
    729 # with or without modifications, as long as this notice is preserved. 
     738# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, 
     739# Inc. 
     740# 
     741# This file is free software; the Free Software Foundation 
     742# gives unlimited permission to copy and/or distribute it, 
     743# with or without modifications, as long as this notice is preserved. 
     744 
     745# serial 1 
    730746 
    731747# AM_PROG_MKDIR_P 
    … …  
    751767# Helper functions for option handling.                     -*- Autoconf -*- 
    752768 
    753 # Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc. 
    754 # 
    755 # This file is free software; the Free Software Foundation 
    756 # gives unlimited permission to copy and/or distribute it, 
    757 # with or without modifications, as long as this notice is preserved. 
    758  
    759 # serial 4 
     769# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software 
     770# Foundation, Inc. 
     771# 
     772# This file is free software; the Free Software Foundation 
     773# gives unlimited permission to copy and/or distribute it, 
     774# with or without modifications, as long as this notice is preserved. 
     775 
     776# serial 5 
    760777 
    761778# _AM_MANGLE_OPTION(NAME) 
    … …  
    765782 
    766783# _AM_SET_OPTION(NAME) 
    767 # ------------------------------ 
     784# -------------------- 
    768785# Set option NAME.  Presently that only means defining a flag for this option. 
    769786AC_DEFUN([_AM_SET_OPTION], 
    … …  
    771788 
    772789# _AM_SET_OPTIONS(OPTIONS) 
    773 # ---------------------------------- 
     790# ------------------------ 
    774791# OPTIONS is a space-separated list of Automake options. 
    775792AC_DEFUN([_AM_SET_OPTIONS], 
    … …  
    847864AC_MSG_RESULT(yes)]) 
    848865 
    849 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc. 
    850 # 
    851 # This file is free software; the Free Software Foundation 
    852 # gives unlimited permission to copy and/or distribute it, 
    853 # with or without modifications, as long as this notice is preserved. 
     866# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. 
     867# 
     868# This file is free software; the Free Software Foundation 
     869# gives unlimited permission to copy and/or distribute it, 
     870# with or without modifications, as long as this notice is preserved. 
     871 
     872# serial 1 
    854873 
    855874# AM_PROG_INSTALL_STRIP 
    … …  
    875894AC_SUBST([INSTALL_STRIP_PROGRAM])]) 
    876895 
    877 # Copyright (C) 2006, 2008  Free Software Foundation, Inc. 
    878 # 
    879 # This file is free software; the Free Software Foundation 
    880 # gives unlimited permission to copy and/or distribute it, 
    881 # with or without modifications, as long as this notice is preserved. 
    882  
    883 # serial 2 
     896# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. 
     897# 
     898# This file is free software; the Free Software Foundation 
     899# gives unlimited permission to copy and/or distribute it, 
     900# with or without modifications, as long as this notice is preserved. 
     901 
     902# serial 3 
    884903 
    885904# _AM_SUBST_NOTMAKE(VARIABLE) 
    … …  
    890909 
    891910# AM_SUBST_NOTMAKE(VARIABLE) 
    892 # --------------------------- 
     911# -------------------------- 
    893912# Public sister of _AM_SUBST_NOTMAKE. 
    894913AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) 
    … …  
    896915# Check how to create a tarball.                            -*- Autoconf -*- 
    897916 
    898 # Copyright (C) 2004, 2005  Free Software Foundation, Inc. 
     917# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. 
    899918# 
    900919# This file is free software; the Free Software Foundation 
    … …  
    918937#     $(am__untar) < result.tar 
    919938AC_DEFUN([_AM_PROG_TAR], 
    920 [# Always define AMTAR for backward compatibility. 
    921 AM_MISSING_PROG([AMTAR], [tar]) 
     939[# Always define AMTAR for backward compatibility.  Yes, it's still used 
     940# in the wild :-(  We should find a proper way to deprecate it ... 
     941AC_SUBST([AMTAR], ['$${TAR-tar}']) 
    922942m4_if([$1], [v7], 
    923      [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], 
     943     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], 
    924944     [m4_case([$1], [ustar],, [pax],, 
    925945              [m4_fatal([Unknown tar format])]) 

  • trunk/config/Makefile.in

    r1748 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    283283installcheck: installcheck-am 
    284284install-strip: 
    285         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    286           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    287           `test -z '$(STRIP)' || \ 
    288             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     285        if test -z '$(STRIP)'; then \ 
     286          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     287            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     288              install; \ 
     289        else \ 
     290          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     291            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     292            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     293        fi 
    289294mostlyclean-generic: 
    290295 

  • trunk/configure

    r1816 r1817  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.68 for libpqxx 4.0. 
     3# Generated by GNU Autoconf 2.68 for libpqxx 5.0. 
    44# 
    55# Report bugs to <Jeroen T. Vermeulen <jtv@xs4all.nl>>. 
    … …  
    571571PACKAGE_NAME='libpqxx' 
    572572PACKAGE_TARNAME='libpqxx' 
    573 PACKAGE_VERSION='4.0' 
    574 PACKAGE_STRING='libpqxx 4.0' 
     573PACKAGE_VERSION='5.0' 
     574PACKAGE_STRING='libpqxx 5.0' 
    575575PACKAGE_BUGREPORT='Jeroen T. Vermeulen <jtv@xs4all.nl>' 
    576576PACKAGE_URL='' 
    … …  
    675675am__fastdepCXX_TRUE 
    676676CXXDEPMODE 
     677am__nodep 
    677678AMDEPBACKSLASH 
    678679AMDEP_FALSE 
    … …  
    13241325  # This message is too long to be a string in the A/UX 3.1 sh. 
    13251326  cat <<_ACEOF 
    1326 \`configure' configures libpqxx 4.0 to adapt to many kinds of systems. 
     1327\`configure' configures libpqxx 5.0 to adapt to many kinds of systems. 
    13271328 
    13281329Usage: $0 [OPTION]... [VAR=VALUE]... 
    … …  
    13941395if test -n "$ac_init_help"; then 
    13951396  case $ac_init_help in 
    1396      short | recursive ) echo "Configuration of libpqxx 4.0:";; 
     1397     short | recursive ) echo "Configuration of libpqxx 5.0:";; 
    13971398   esac 
    13981399  cat <<\_ACEOF 
    … …  
    15041505if $ac_init_version; then 
    15051506  cat <<\_ACEOF 
    1506 libpqxx configure 4.0 
     1507libpqxx configure 5.0 
    15071508generated by GNU Autoconf 2.68 
    15081509 
    … …  
    20362037running configure, to aid debugging if configure makes a mistake. 
    20372038 
    2038 It was created by libpqxx $as_me 4.0, which was 
     2039It was created by libpqxx $as_me 5.0, which was 
    20392040generated by GNU Autoconf 2.68.  Invocation command line was 
    20402041 
    … …  
    28582859# Define the identity of the package. 
    28592860 PACKAGE=libpqxx 
    2860  VERSION=4.0 
     2861 VERSION=5.0 
    28612862 
    28622863 
    … …  
    28882889# We need awk for the "check" target.  The system "awk" is bad on 
    28892890# some platforms. 
    2890 # Always define AMTAR for backward compatibility. 
    2891  
    2892 AMTAR=${AMTAR-"${am_missing_run}tar"} 
    2893  
    2894 am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' 
    2895  
    2896  
    2897  
    2898  
    2899  
    2900  
    2901 PQXXVERSION=4.0 
    2902 PQXX_ABI=4.0 
    2903 PQXX_MAJOR=4 
     2891# Always define AMTAR for backward compatibility.  Yes, it's still used 
     2892# in the wild :-(  We should find a proper way to deprecate it ... 
     2893AMTAR='$${TAR-tar}' 
     2894 
     2895am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' 
     2896 
     2897 
     2898 
     2899 
     2900 
     2901 
     2902PQXXVERSION=5.0 
     2903PQXX_ABI=5.0 
     2904PQXX_MAJOR=5 
    29042905PQXX_MINOR=0 
    29052906 
    … …  
    34743475  am_depcomp="$ac_aux_dir/depcomp" 
    34753476  AMDEPBACKSLASH='\' 
     3477  am__nodep='_no' 
    34763478fi 
    34773479 if test "x$enable_dependency_tracking" != xno; then 
    … …  
    34983500  # making a dummy file named `D' -- because `-MD' means `put the output 
    34993501  # in D'. 
     3502  rm -rf conftest.dir 
    35003503  mkdir conftest.dir 
    35013504  # Copy depcomp to subdir because otherwise we won't find it if we're 
    … …  
    35573560      fi 
    35583561      ;; 
    3559     msvisualcpp | msvcmsys) 
     3562    msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    35603563      # This compiler won't grok `-c -o', but also, the minuso test has 
    35613564      # not run yet.  These depmodes are late enough in the game, and 
    … …  
    41654168  # making a dummy file named `D' -- because `-MD' means `put the output 
    41664169  # in D'. 
     4170  rm -rf conftest.dir 
    41674171  mkdir conftest.dir 
    41684172  # Copy depcomp to subdir because otherwise we won't find it if we're 
    … …  
    42244228      fi 
    42254229      ;; 
    4226     msvisualcpp | msvcmsys) 
     4230    msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    42274231      # This compiler won't grok `-c -o', but also, the minuso test has 
    42284232      # not run yet.  These depmodes are late enough in the game, and 
    … …  
    1641316417failed to link properly to the libpq library.  This may be because the libpq 
    1641416418library file is damaged, or in some incorrect format. or if your libpq is much 
    16415 more recent than libpqxx version 4.0, perhaps libpq has undergone a 
     16419more recent than libpqxx version 5.0, perhaps libpq has undergone a 
    1641616420radical ABI change. 
    1641716421 
    … …  
    1819318197# values after options handling. 
    1819418198ac_log=" 
    18195 This file was extended by libpqxx $as_me 4.0, which was 
     18199This file was extended by libpqxx $as_me 5.0, which was 
    1819618200generated by GNU Autoconf 2.68.  Invocation command line was 
    1819718201 
    … …  
    1825918263ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
    1826018264ac_cs_version="\\ 
    18261 libpqxx config.status 4.0 
     18265libpqxx config.status 5.0 
    1826218266configured by $0, generated by GNU Autoconf 2.68, 
    1826318267  with options \\"\$ac_cs_config\\" 

  • trunk/configure.ac

    r1806 r1817  
    1212 
    1313AC_PREREQ(2.59) 
    14 AC_INIT(libpqxx, 4.0, [Jeroen T. Vermeulen <jtv@xs4all.nl>]) 
     14AC_INIT(libpqxx, 5.0, [Jeroen T. Vermeulen <jtv@xs4all.nl>]) 
    1515AC_LANG(C++) 
    1616AC_CONFIG_AUX_DIR(config) 
    1717AC_CONFIG_MACRO_DIR([config/m4]) 
    18 AM_INIT_AUTOMAKE(libpqxx, 4.0) 
    19  
    20 PQXXVERSION=4.0 
    21 PQXX_ABI=4.0 
    22 PQXX_MAJOR=4 
     18AM_INIT_AUTOMAKE(libpqxx, 5.0) 
     19 
     20PQXXVERSION=5.0 
     21PQXX_ABI=5.0 
     22PQXX_MAJOR=5 
    2323PQXX_MINOR=0 
    2424AC_SUBST(PQXXVERSION) 
    … …  
    459459failed to link properly to the libpq library.  This may be because the libpq 
    460460library file is damaged, or in some incorrect format. or if your libpq is much 
    461 more recent than libpqxx version 4.0, perhaps libpq has undergone a 
     461more recent than libpqxx version 5.0, perhaps libpq has undergone a 
    462462radical ABI change. 
    463463 

  • trunk/debian/Makefile.in

    r1748 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    302302installcheck: installcheck-am 
    303303install-strip: 
    304         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    305           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    306           `test -z '$(STRIP)' || \ 
    307             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     304        if test -z '$(STRIP)'; then \ 
     305          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     306            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     307              install; \ 
     308        else \ 
     309          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     310            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     311            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     312        fi 
    308313mostlyclean-generic: 
    309314 

  • trunk/debian/changelog

    r1808 r1817  
     1libpqxx (5.0-1) unstable; urgency=low 
     2 
     3  * Build fix for OS X.  Thanks Torsten Hilgenberg. 
     4 
     5 -- Jeroen T. Vermeulen <jtv@xs4all.nl>  Tue, 28 Feb 2012 19:16:00 +0700 
     6 
    17libpqxx (4.0-1) unstable; urgency=medium 
    28 

  • trunk/doc/Makefile.in

    r1806 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    291291installcheck: installcheck-am 
    292292install-strip: 
    293         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    294           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    295           `test -z '$(STRIP)' || \ 
    296             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     293        if test -z '$(STRIP)'; then \ 
     294          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     295            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     296              install; \ 
     297        else \ 
     298          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     299            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     300            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     301        fi 
    297302mostlyclean-generic: 
    298303 

  • trunk/include/Makefile.in

    r1761 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    8181  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 
    8282  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 
     83am__uninstall_files_from_dir = { \ 
     84  test -z "$$files" \ 
     85    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 
     86    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 
     87         $(am__cd) "$$dir" && rm -f $$files; }; \ 
     88  } 
    8389am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" 
    8490HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS) 
    … …  
    374380        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ 
    375381        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ 
    376         test -n "$$files" || exit 0; \ 
    377         echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ 
    378         cd "$(DESTDIR)$(includedir)" && rm -f $$files 
     382        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) 
    379383install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS) 
    380384        @$(NORMAL_INSTALL) 
    … …  
    397401        @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ 
    398402        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ 
    399         test -n "$$files" || exit 0; \ 
    400         echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ 
    401         cd "$(DESTDIR)$(includedir)" && rm -f $$files 
     403        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) 
    402404 
    403405# This directory's subdirectories are mostly independent; you can cd 
    … …  
    612614installcheck: installcheck-recursive 
    613615install-strip: 
    614         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    615           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    616           `test -z '$(STRIP)' || \ 
    617             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     616        if test -z '$(STRIP)'; then \ 
     617          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     618            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     619              install; \ 
     620        else \ 
     621          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     622            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     623            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     624        fi 
    618625mostlyclean-generic: 
    619626 

  • trunk/include/pqxx/Makefile.in

    r1748 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    242242 
    243243config.h: stamp-h1 
    244         @if test ! -f $@; then \ 
    245           rm -f stamp-h1; \ 
    246           $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ 
    247         else :; fi 
     244        @if test ! -f $@; then rm -f stamp-h1; else :; fi 
     245        @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi 
    248246 
    249247stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status 
    … …  
    360358installcheck: installcheck-am 
    361359install-strip: 
    362         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    363           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    364           `test -z '$(STRIP)' || \ 
    365             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     360        if test -z '$(STRIP)'; then \ 
     361          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     362            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     363              install; \ 
     364        else \ 
     365          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     366            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     367            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     368        fi 
    366369mostlyclean-generic: 
    367370 

  • trunk/include/pqxx/version.hxx

    r1736 r1817  
    1919 
    2020/// Full libpqxx version string. 
    21 #define PQXX_VERSION "4.0" 
     21#define PQXX_VERSION "5.0" 
    2222 
    2323/// Major version number for this libpqxx release. 
    24 #define PQXX_VERSION_MAJOR 4 
     24#define PQXX_VERSION_MAJOR 5 
    2525 
    2626/// Minor version number for this libpqxx release. 
    … …  
    2828 
    2929/// Library ABI version. 
    30 #define PQXX_ABI "4.0" 
     30#define PQXX_ABI "5.0" 
    3131 
    3232#endif 

  • trunk/src/Makefile.in

    r1756 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    7171  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 
    7272  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 
     73am__uninstall_files_from_dir = { \ 
     74  test -z "$$files" \ 
     75    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 
     76    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 
     77         $(am__cd) "$$dir" && rm -f $$files; }; \ 
     78  } 
    7379am__installdirs = "$(DESTDIR)$(libdir)" 
    7480LTLIBRARIES = $(lib_LTLIBRARIES) 
    … …  
    339345          rm -f "$${dir}/so_locations"; \ 
    340346        done 
    341 libpqxx.la: $(libpqxx_la_OBJECTS) $(libpqxx_la_DEPENDENCIES)  
     347libpqxx.la: $(libpqxx_la_OBJECTS) $(libpqxx_la_DEPENDENCIES) $(EXTRA_libpqxx_la_DEPENDENCIES)  
    342348        $(libpqxx_la_LINK) -rpath $(libdir) $(libpqxx_la_OBJECTS) $(libpqxx_la_LIBADD) $(LIBS) 
    343349 
    … …  
    501507installcheck: installcheck-am 
    502508install-strip: 
    503         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    504           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    505           `test -z '$(STRIP)' || \ 
    506             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     509        if test -z '$(STRIP)'; then \ 
     510          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     511            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     512              install; \ 
     513        else \ 
     514          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     515            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     516            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     517        fi 
    507518mostlyclean-generic: 
    508519 

  • trunk/test/Makefile.in

    r1790 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    421421        echo " rm -f" $$list; \ 
    422422        rm -f $$list 
    423 runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES)  
     423runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDENCIES)  
    424424        @rm -f runner$(EXEEXT) 
    425425        $(CXXLINK) $(runner_OBJECTS) $(runner_LDADD) $(LIBS) 
    … …  
    747747          dashes=`echo "$$dashes" | sed s/./=/g`; \ 
    748748          if test "$$failed" -eq 0; then \ 
    749             echo "$$grn$$dashes"; \ 
     749            col="$$grn"; \ 
    750750          else \ 
    751             echo "$$red$$dashes"; \ 
    752           fi; \ 
    753           echo "$$banner"; \ 
    754           test -z "$$skipped" || echo "$$skipped"; \ 
    755           test -z "$$report" || echo "$$report"; \ 
    756           echo "$$dashes$$std"; \ 
     751            col="$$red"; \ 
     752          fi; \ 
     753          echo "$${col}$$dashes$${std}"; \ 
     754          echo "$${col}$$banner$${std}"; \ 
     755          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ 
     756          test -z "$$report" || echo "$${col}$$report$${std}"; \ 
     757          echo "$${col}$$dashes$${std}"; \ 
    757758          test "$$failed" -eq 0; \ 
    758759        else :; fi 
    … …  
    833834installcheck: installcheck-recursive 
    834835install-strip: 
    835         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    836           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    837           `test -z '$(STRIP)' || \ 
    838             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     836        if test -z '$(STRIP)'; then \ 
     837          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     838            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     839              install; \ 
     840        else \ 
     841          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     842            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     843            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     844        fi 
    839845mostlyclean-generic: 
    840846 

  • trunk/test/unit/Makefile.in

    r1790 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    304304        echo " rm -f" $$list; \ 
    305305        rm -f $$list 
    306 runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES)  
     306runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDENCIES)  
    307307        @rm -f runner$(EXEEXT) 
    308308        $(CXXLINK) $(runner_OBJECTS) $(runner_LDADD) $(LIBS) 
    … …  
    495495          dashes=`echo "$$dashes" | sed s/./=/g`; \ 
    496496          if test "$$failed" -eq 0; then \ 
    497             echo "$$grn$$dashes"; \ 
     497            col="$$grn"; \ 
    498498          else \ 
    499             echo "$$red$$dashes"; \ 
     499            col="$$red"; \ 
    500500          fi; \ 
    501           echo "$$banner"; \ 
    502           test -z "$$skipped" || echo "$$skipped"; \ 
    503           test -z "$$report" || echo "$$report"; \ 
    504           echo "$$dashes$$std"; \ 
     501          echo "$${col}$$dashes$${std}"; \ 
     502          echo "$${col}$$banner$${std}"; \ 
     503          test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ 
     504          test -z "$$report" || echo "$${col}$$report$${std}"; \ 
     505          echo "$${col}$$dashes$${std}"; \ 
    505506          test "$$failed" -eq 0; \ 
    506507        else :; fi 
    … …  
    552553installcheck: installcheck-am 
    553554install-strip: 
    554         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    555           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    556           `test -z '$(STRIP)' || \ 
    557             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     555        if test -z '$(STRIP)'; then \ 
     556          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     557            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     558              install; \ 
     559        else \ 
     560          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     561            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     562            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     563        fi 
    558564mostlyclean-generic: 
    559565 

  • trunk/tools/Makefile.in

    r1813 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    272272        echo " rm -f" $$list; \ 
    273273        rm -f $$list 
    274 pqxxthreadsafety$(EXEEXT): $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_DEPENDENCIES)  
     274pqxxthreadsafety$(EXEEXT): $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_DEPENDENCIES) $(EXTRA_pqxxthreadsafety_DEPENDENCIES)  
    275275        @rm -f pqxxthreadsafety$(EXEEXT) 
    276276        $(CXXLINK) $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_LDADD) $(LIBS) 
    277 rmlo$(EXEEXT): $(rmlo_OBJECTS) $(rmlo_DEPENDENCIES)  
     277rmlo$(EXEEXT): $(rmlo_OBJECTS) $(rmlo_DEPENDENCIES) $(EXTRA_rmlo_DEPENDENCIES)  
    278278        @rm -f rmlo$(EXEEXT) 
    279279        $(CXXLINK) $(rmlo_OBJECTS) $(rmlo_LDADD) $(LIBS) 
    … …  
    411411installcheck: installcheck-am 
    412412install-strip: 
    413         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    414           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    415           `test -z '$(STRIP)' || \ 
    416             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     413        if test -z '$(STRIP)'; then \ 
     414          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     415            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     416              install; \ 
     417        else \ 
     418          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     419            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     420            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     421        fi 
    417422mostlyclean-generic: 
    418423 

  • trunk/tools/extract_version

    r1546 r1817  
    3434get_version() { 
    3535        grep -w 'PQXX_VERSION' VERSION | 
    36                 sed -e 's/^[[:space:]A-Z_]*\([^[:space:]#]\+\).*$/\1/' 
     36                sed -E -e 's/^[[:space:]A-Z_]*([^[:space:]#]+).*$/\1/' 
    3737} 
    3838 

  • trunk/win32/Makefile.in

    r1792 r1817  
    1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 
     1# Makefile.in generated by automake 1.11.3 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, 
    6 # Inc. 
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
     6# Foundation, Inc. 
    77# This Makefile.in is free software; the Free Software Foundation 
    88# gives unlimited permission to copy and/or distribute it, 
    … …  
    288288installcheck: installcheck-am 
    289289install-strip: 
    290         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
    291           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
    292           `test -z '$(STRIP)' || \ 
    293             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install 
     290        if test -z '$(STRIP)'; then \ 
     291          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     292            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     293              install; \ 
     294        else \ 
     295          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 
     296            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 
     297            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ 
     298        fi 
    294299mostlyclean-generic: 
    295300 
Note: See TracChangeset for help on using the changeset viewer.