diff --git a/Makefile.in b/Makefile.in index 2abdf8e2..9c9d0911 100644 --- a/Makefile.in +++ b/Makefile.in @@ -326,6 +326,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/configure b/configure index 5f21f276..865b3176 100755 --- a/configure +++ b/configure @@ -784,6 +784,9 @@ POSTGRESQL_LIBS POSTGRESQL_LDFLAGS POSTGRESQL_CPPFLAGS POSTGRESQL_VERSION +PG_CONFIG_CPPFLAGS +PG_CONFIG_LDFLAGS +PG_CONFIG_LIBS PG_CONFIG MYSQL_LDFLAGS MYSQL_INCLUDE @@ -30266,6 +30269,10 @@ else fi + PG_CONFIG_LIBS="" + PG_CONFIG_LDFLAGS="" + PG_CONFIG_CPPFLAGS="" + POSTGRESQL_CPPFLAGS="" POSTGRESQL_LDFLAGS="" POSTGRESQL_LIBS="" @@ -30330,6 +30337,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL client libraries" >&5 $as_echo_n "checking for PostgreSQL client libraries... " >&6; } + PG_CONFIG_LIBS=`$PG_CONFIG --libs` + PG_CONFIG_LDFLAGS=`$PG_CONFIG --ldflags` + PG_CONFIG_CPPFLAGS=`$PG_CONFIG --cppflags` + postgresql_libdir=`$PG_CONFIG --libdir` postgresql_cincdir=`$PG_CONFIG --includedir` postgresql_sincdir=`$PG_CONFIG --includedir-server` @@ -30403,6 +30414,9 @@ $as_echo "no" >&6; } $as_echo "#define HAVE_POSTGRESQL 0" >>confdefs.h + PG_CONFIG_LIBS="" + PG_CONFIG_LDFLAGS="" + PG_CONFIG_CPPFLAGS="" POSTGRESQL_CPPFLAGS="" POSTGRESQL_LDFLAGS="" POSTGRESQL_LIBS="" @@ -30415,6 +30429,10 @@ $as_echo "#define HAVE_POSTGRESQL 0" >>confdefs.h + + + + if false; then HAVE_PGSQL_TRUE= HAVE_PGSQL_FALSE='#' @@ -33311,7 +33329,7 @@ timer.tv_sec = 1; timer.tv_usec = 0; #endif if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, (const void*)&timer, sizeof(timer)) == 0) { -host = gethostbyname("www.gnu.org"); +host = gethostbyname("www.google.com"); addr.sin_family = AF_INET; addr.sin_port = htons(80); addr.sin_addr = *((struct in_addr*)host->h_addr); @@ -33838,9 +33856,7 @@ $as_echo "#define U_STATIC_ORM_DRIVER_SQLITE /**/" >>confdefs.h elif test "$drv" = "pgsql"; then static_handler_pgsql="yes" - ULIB_LIBS="$ULIB_LIBS $POSTGRESQL_LIBS" - LDFLAGS="$POSTGRESQL_LDFLAGS $LDFLAGS" - CPPFLAGS="$POSTGRESQL_CPPFLAGS $CPPFLAGS" + CPPFLAGS="$POSTGRESQL_CPPFLAGS $CPPFLAGS" $as_echo "#define U_STATIC_ORM_DRIVER_PGSQL /**/" >>confdefs.h diff --git a/configure.ac b/configure.ac index cca19260..0e0212e0 100644 --- a/configure.ac +++ b/configure.ac @@ -2313,9 +2313,7 @@ for drv in $use_static_driver; do AC_DEFINE(U_STATIC_ORM_DRIVER_SQLITE,, [STATIC_ORM_DRIVER_SQLITE]) elif test "$drv" = "pgsql"; then static_handler_pgsql="yes" - ULIB_LIBS="$ULIB_LIBS $POSTGRESQL_LIBS" - LDFLAGS="$POSTGRESQL_LDFLAGS $LDFLAGS" - CPPFLAGS="$POSTGRESQL_CPPFLAGS $CPPFLAGS" + CPPFLAGS="$POSTGRESQL_CPPFLAGS $CPPFLAGS" AC_DEFINE(U_STATIC_ORM_DRIVER_PGSQL,, [STATIC_ORM_DRIVER_PGSQL]) elif test "$drv" = "mysql"; then static_handler_mysql="yes" diff --git a/contrib/HCSP/Makefile.in b/contrib/HCSP/Makefile.in index 4061498c..b07687f9 100644 --- a/contrib/HCSP/Makefile.in +++ b/contrib/HCSP/Makefile.in @@ -290,6 +290,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 53b40a33..143b1732 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -272,6 +272,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/contrib/RSIGN/Makefile.in b/contrib/RSIGN/Makefile.in index da1c91dc..38c5b01a 100644 --- a/contrib/RSIGN/Makefile.in +++ b/contrib/RSIGN/Makefile.in @@ -262,6 +262,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/contrib/signer/Makefile.in b/contrib/signer/Makefile.in index f497363b..3d44dcf3 100644 --- a/contrib/signer/Makefile.in +++ b/contrib/signer/Makefile.in @@ -261,6 +261,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 149aecb6..cfb07e0e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -210,6 +210,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/IR/Makefile.in b/examples/IR/Makefile.in index 044a33a2..4aebe259 100644 --- a/examples/IR/Makefile.in +++ b/examples/IR/Makefile.in @@ -357,6 +357,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/Makefile.in b/examples/Makefile.in index b96e9e14..d056c05b 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -282,6 +282,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/PEC_log/Makefile.in b/examples/PEC_log/Makefile.in index be7ae1e3..9526721e 100644 --- a/examples/PEC_log/Makefile.in +++ b/examples/PEC_log/Makefile.in @@ -358,6 +358,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/WiAuth/Makefile.in b/examples/WiAuth/Makefile.in index 7ea4c403..57b834be 100644 --- a/examples/WiAuth/Makefile.in +++ b/examples/WiAuth/Makefile.in @@ -384,6 +384,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/WiAuth/v2/Makefile.in b/examples/WiAuth/v2/Makefile.in index 335fb81a..bbe13d4f 100644 --- a/examples/WiAuth/v2/Makefile.in +++ b/examples/WiAuth/v2/Makefile.in @@ -293,6 +293,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/XAdES/Makefile.in b/examples/XAdES/Makefile.in index e0a2a501..c14372e2 100644 --- a/examples/XAdES/Makefile.in +++ b/examples/XAdES/Makefile.in @@ -301,6 +301,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/csp/Makefile.in b/examples/csp/Makefile.in index e253326d..0f0e6f45 100644 --- a/examples/csp/Makefile.in +++ b/examples/csp/Makefile.in @@ -275,6 +275,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/doc_classifier/Makefile.in b/examples/doc_classifier/Makefile.in index 5d60303c..37589196 100644 --- a/examples/doc_classifier/Makefile.in +++ b/examples/doc_classifier/Makefile.in @@ -282,6 +282,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/doc_parse/Makefile.in b/examples/doc_parse/Makefile.in index 071ddc09..82df3bbe 100644 --- a/examples/doc_parse/Makefile.in +++ b/examples/doc_parse/Makefile.in @@ -262,6 +262,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/download_accelerator/Makefile.in b/examples/download_accelerator/Makefile.in index f1fbafc7..dc9f40bf 100644 --- a/examples/download_accelerator/Makefile.in +++ b/examples/download_accelerator/Makefile.in @@ -263,6 +263,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/form_completion/Makefile.in b/examples/form_completion/Makefile.in index 34b68496..9640d0d8 100644 --- a/examples/form_completion/Makefile.in +++ b/examples/form_completion/Makefile.in @@ -263,6 +263,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/hello/Makefile.in b/examples/hello/Makefile.in index 798bd134..3cbca7ae 100644 --- a/examples/hello/Makefile.in +++ b/examples/hello/Makefile.in @@ -259,6 +259,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/http_header/Makefile.in b/examples/http_header/Makefile.in index c3c805e0..9be2f7fa 100644 --- a/examples/http_header/Makefile.in +++ b/examples/http_header/Makefile.in @@ -261,6 +261,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/lcsp/Makefile.in b/examples/lcsp/Makefile.in index e8dc1fd1..91402012 100644 --- a/examples/lcsp/Makefile.in +++ b/examples/lcsp/Makefile.in @@ -275,6 +275,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/lrp_session/Makefile.in b/examples/lrp_session/Makefile.in index 0e2b7b0c..bc771617 100644 --- a/examples/lrp_session/Makefile.in +++ b/examples/lrp_session/Makefile.in @@ -268,6 +268,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/rsign/Makefile.in b/examples/rsign/Makefile.in index acec0e1b..02790fba 100644 --- a/examples/rsign/Makefile.in +++ b/examples/rsign/Makefile.in @@ -276,6 +276,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/serialize/Makefile.in b/examples/serialize/Makefile.in index 4fc33265..ff3b3238 100644 --- a/examples/serialize/Makefile.in +++ b/examples/serialize/Makefile.in @@ -259,6 +259,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/simple_client_server/Makefile.in b/examples/simple_client_server/Makefile.in index 7725bad0..87958b42 100644 --- a/examples/simple_client_server/Makefile.in +++ b/examples/simple_client_server/Makefile.in @@ -268,6 +268,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/test_manager/Makefile.in b/examples/test_manager/Makefile.in index 90faec8c..fe09e2d7 100644 --- a/examples/test_manager/Makefile.in +++ b/examples/test_manager/Makefile.in @@ -262,6 +262,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/uclient/Makefile.in b/examples/uclient/Makefile.in index 270c7158..ba7c6bed 100644 --- a/examples/uclient/Makefile.in +++ b/examples/uclient/Makefile.in @@ -293,6 +293,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/userver/Makefile.in b/examples/userver/Makefile.in index da633e44..6ef6fdd2 100644 --- a/examples/userver/Makefile.in +++ b/examples/userver/Makefile.in @@ -330,6 +330,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/workflow/Makefile.in b/examples/workflow/Makefile.in index 7dfd6f53..238092a7 100644 --- a/examples/workflow/Makefile.in +++ b/examples/workflow/Makefile.in @@ -282,6 +282,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/examples/xml2txt/Makefile.in b/examples/xml2txt/Makefile.in index 81c182a0..1539c8db 100644 --- a/examples/xml2txt/Makefile.in +++ b/examples/xml2txt/Makefile.in @@ -262,6 +262,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in index 8c672ca2..4c90d6d0 100644 --- a/fuzz/Makefile.in +++ b/fuzz/Makefile.in @@ -273,6 +273,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/include/Makefile.in b/include/Makefile.in index 1329324b..e06b8f95 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -301,6 +301,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/include/ulib/Makefile.in b/include/ulib/Makefile.in index 98385bb7..fe935c73 100644 --- a/include/ulib/Makefile.in +++ b/include/ulib/Makefile.in @@ -210,6 +210,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/include/ulib/utility/string_ext.h b/include/ulib/utility/string_ext.h index b74cb8c7..8f058dcf 100644 --- a/include/ulib/utility/string_ext.h +++ b/include/ulib/utility/string_ext.h @@ -339,9 +339,9 @@ public: } } - static uint32_t substr_count(const UString& s, char a) { return substr_count(U_STRING_TO_PARAM(s), &a, 1); } - static uint32_t substr_count(const UString& s, const char* a, uint32_t n) { return substr_count(U_STRING_TO_PARAM(s), a, n); } - static uint32_t substr_count(const UString& s, const UString& a) { return substr_count(U_STRING_TO_PARAM(s), U_STRING_TO_PARAM(a)); } + static __pure uint32_t substr_count(const UString& s, char a) { return substr_count(U_STRING_TO_PARAM(s), &a, 1); } + static __pure uint32_t substr_count(const UString& s, const char* a, uint32_t n) { return substr_count(U_STRING_TO_PARAM(s), a, n); } + static __pure uint32_t substr_count(const UString& s, const UString& a) { return substr_count(U_STRING_TO_PARAM(s), U_STRING_TO_PARAM(a)); } // manage escaping for delimiter character diff --git a/include/ulib/utility/websocket.h b/include/ulib/utility/websocket.h index 0fadf720..b54bc1e1 100644 --- a/include/ulib/utility/websocket.h +++ b/include/ulib/utility/websocket.h @@ -168,6 +168,9 @@ public: u_buffer_len = u__snprintf(u_buffer, U_BUFFER_SIZE, U_CONSTANT_TO_PARAM("%u %u"), rec->csocket, rec->user_id); } + static UString* message; + static int message_type; + private: static uwrec* rec; static int fd_stderr; @@ -178,10 +181,9 @@ private: static uint32_t max_message_size; static URDBObjectHandler* db; + static int status_code; static UString* rbuffer; - static UString* message; static const char* upgrade_settings; - static int message_type, status_code; static WebSocketFrameData control_frame; static WebSocketFrameData message_frame; diff --git a/m4/Makefile.in b/m4/Makefile.in index e1dd92b2..d7c67e1d 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -227,6 +227,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 index 008850b9..6fbc5f87 100644 --- a/m4/ax_lib_postgresql.m4 +++ b/m4/ax_lib_postgresql.m4 @@ -27,10 +27,14 @@ # # This macro calls: # -# AC_SUBST(POSTGRESQL_CPPFLAGS) -# AC_SUBST(POSTGRESQL_LDFLAGS) -# AC_SUBST(POSTGRESQL_LIBS) -# AC_SUBST(POSTGRESQL_VERSION) +# AC_SUBST([PG_CONFIG_LIBS]) +# AC_SUBST([PG_CONFIG_LDFLAGS]) +# AC_SUBST([PG_CONFIG_CPPFLAGS]) +# +# AC_SUBST(POSTGRESQL_CPPFLAGS) +# AC_SUBST(POSTGRESQL_LDFLAGS) +# AC_SUBST(POSTGRESQL_LIBS) +# AC_SUBST(POSTGRESQL_VERSION) # # And sets: # @@ -69,6 +73,10 @@ AC_DEFUN([AX_LIB_POSTGRESQL], [want_postgresql="no"] ) + PG_CONFIG_LIBS="" + PG_CONFIG_LDFLAGS="" + PG_CONFIG_CPPFLAGS="" + POSTGRESQL_CPPFLAGS="" POSTGRESQL_LDFLAGS="" POSTGRESQL_LIBS="" @@ -94,6 +102,10 @@ AC_DEFUN([AX_LIB_POSTGRESQL], found_postgresql="yes" AC_MSG_CHECKING([for PostgreSQL client libraries]) + PG_CONFIG_LIBS=`$PG_CONFIG --libs` + PG_CONFIG_LDFLAGS=`$PG_CONFIG --ldflags` + PG_CONFIG_CPPFLAGS=`$PG_CONFIG --cppflags` + postgresql_libdir=`$PG_CONFIG --libdir` postgresql_cincdir=`$PG_CONFIG --includedir` postgresql_sincdir=`$PG_CONFIG --includedir-server` @@ -163,12 +175,19 @@ AC_DEFUN([AX_LIB_POSTGRESQL], AC_MSG_RESULT([no]) AC_DEFINE([HAVE_POSTGRESQL], [0], [A required version of PostgreSQL is not found]) + PG_CONFIG_LIBS="" + PG_CONFIG_LDFLAGS="" + PG_CONFIG_CPPFLAGS="" POSTGRESQL_CPPFLAGS="" POSTGRESQL_LDFLAGS="" POSTGRESQL_LIBS="" fi fi + AC_SUBST([PG_CONFIG_LIBS]) + AC_SUBST([PG_CONFIG_LDFLAGS]) + AC_SUBST([PG_CONFIG_CPPFLAGS]) + AC_SUBST([POSTGRESQL_VERSION]) AC_SUBST([POSTGRESQL_CPPFLAGS]) AC_SUBST([POSTGRESQL_LDFLAGS]) diff --git a/m4/socket_SO_RCVTIMEO.m4 b/m4/socket_SO_RCVTIMEO.m4 index b1f44259..0cb6543a 100644 --- a/m4/socket_SO_RCVTIMEO.m4 +++ b/m4/socket_SO_RCVTIMEO.m4 @@ -38,7 +38,7 @@ timer.tv_sec = 1; timer.tv_usec = 0; #endif if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, (const void*)&timer, sizeof(timer)) == 0) { -host = gethostbyname("www.gnu.org"); +host = gethostbyname("www.google.com"); addr.sin_family = AF_INET; addr.sin_port = htons(80); addr.sin_addr = *((struct in_addr*)host->h_addr); diff --git a/src/ulib/Makefile.am b/src/ulib/Makefile.am index 881c8906..b9822344 100644 --- a/src/ulib/Makefile.am +++ b/src/ulib/Makefile.am @@ -309,7 +309,7 @@ lib@ULIB@_la_LDFLAGS = @ULIB_LIBS@ if STATIC_ORM_DRIVER_PGSQL SRC_CPP += orm/driver/orm_driver_pgsql.cpp -lib@ULIB@_la_LDFLAGS += $(top_builddir)/src/ulib/orm/driver/libpq/libpq.la @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ +lib@ULIB@_la_LDFLAGS += $(top_builddir)/src/ulib/orm/driver/libpq/libpq.la endif lib@ULIB@_la_LDFLAGS += -version-info 1:0:0 -release @ULIB_VERSION@ diff --git a/src/ulib/Makefile.in b/src/ulib/Makefile.in index 35c7c7cf..df907692 100644 --- a/src/ulib/Makefile.in +++ b/src/ulib/Makefile.in @@ -153,7 +153,7 @@ target_triplet = @target@ @STATIC_ORM_DRIVER_SQLITE_TRUE@am__append_63 = orm/driver/orm_driver_sqlite.cpp @STATIC_ORM_DRIVER_MYSQL_TRUE@am__append_64 = orm/driver/orm_driver_mysql.cpp @STATIC_ORM_DRIVER_PGSQL_TRUE@am__append_65 = orm/driver/orm_driver_pgsql.cpp -@STATIC_ORM_DRIVER_PGSQL_TRUE@am__append_66 = $(top_builddir)/src/ulib/orm/driver/libpq/libpq.la @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ +@STATIC_ORM_DRIVER_PGSQL_TRUE@am__append_66 = $(top_builddir)/src/ulib/orm/driver/libpq/libpq.la @MINGW_TRUE@am__append_67 = -export-symbols $(srcdir)/@ULIB@.def -no-undefined -Wl,ULib-win32-res.o # Handler static http servlet @@ -652,6 +652,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/base/utility.c b/src/ulib/base/utility.c index 32b932dd..4db163f2 100644 --- a/src/ulib/base/utility.c +++ b/src/ulib/base/utility.c @@ -684,7 +684,7 @@ bool u_runAsUser(const char* restrict user, bool change_dir) return false; } - (void) u__strncpy(u_user_name, user, (u_user_name_len = u__strlen(user, __PRETTY_FUNCTION__))); /* change user name */ + (void) memcpy(u_user_name, user, (u_user_name_len = u__strlen(user, __PRETTY_FUNCTION__))+1); /* change user name */ if (change_dir && pw->pw_dir && diff --git a/src/ulib/base/zip/ziptool.c b/src/ulib/base/zip/ziptool.c index e87161d0..ac41f728 100644 --- a/src/ulib/base/zip/ziptool.c +++ b/src/ulib/base/zip/ziptool.c @@ -458,9 +458,7 @@ static int add_to_zip(int fd, const char* file) { if (U_ISDOTS(de->d_name)) continue; - d_namlen = NAMLEN(de); - - (void) u__strncpy(t_ptr, de->d_name, d_namlen); + (void) memcpy(t_ptr, de->d_name, (d_namlen = NAMLEN(de))); t_ptr[d_namlen] = '\0'; diff --git a/src/ulib/net/client/redis.cpp b/src/ulib/net/client/redis.cpp index 939d61ce..2993a71b 100644 --- a/src/ulib/net/client/redis.cpp +++ b/src/ulib/net/client/redis.cpp @@ -228,7 +228,7 @@ U_NO_EXPORT bool UREDISClient_Base::getResponseItem() { len += U_CONSTANT_SIZE(U_CRLF); - while (len > UClient_Base::response.remain(ptr2)) + while (len > (uint32_t)UClient_Base::response.remain(ptr2)) { uint32_t d = UClient_Base::response.distance(ptr2); diff --git a/src/ulib/net/server/plugin/Makefile.in b/src/ulib/net/server/plugin/Makefile.in index 2b781c91..c386d13c 100644 --- a/src/ulib/net/server/plugin/Makefile.in +++ b/src/ulib/net/server/plugin/Makefile.in @@ -500,6 +500,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/mod_geoip/Makefile.in b/src/ulib/net/server/plugin/mod_geoip/Makefile.in index 571a082f..7a58f9e5 100644 --- a/src/ulib/net/server/plugin/mod_geoip/Makefile.in +++ b/src/ulib/net/server/plugin/mod_geoip/Makefile.in @@ -289,6 +289,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/mod_shib/Makefile.in b/src/ulib/net/server/plugin/mod_shib/Makefile.in index 3e9902d0..cfc2be0c 100644 --- a/src/ulib/net/server/plugin/mod_shib/Makefile.in +++ b/src/ulib/net/server/plugin/mod_shib/Makefile.in @@ -289,6 +289,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/page_speed/Makefile.in b/src/ulib/net/server/plugin/page_speed/Makefile.in index 4372fc72..ab4c37b6 100644 --- a/src/ulib/net/server/plugin/page_speed/Makefile.in +++ b/src/ulib/net/server/plugin/page_speed/Makefile.in @@ -290,6 +290,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/php/Makefile.in b/src/ulib/net/server/plugin/php/Makefile.in index 25b51306..cde696ad 100644 --- a/src/ulib/net/server/plugin/php/Makefile.in +++ b/src/ulib/net/server/plugin/php/Makefile.in @@ -289,6 +289,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/python/Makefile.in b/src/ulib/net/server/plugin/python/Makefile.in index 437b80c0..f4ac81ab 100644 --- a/src/ulib/net/server/plugin/python/Makefile.in +++ b/src/ulib/net/server/plugin/python/Makefile.in @@ -290,6 +290,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/ruby/Makefile.in b/src/ulib/net/server/plugin/ruby/Makefile.in index 5fe0f19f..06fd49d9 100644 --- a/src/ulib/net/server/plugin/ruby/Makefile.in +++ b/src/ulib/net/server/plugin/ruby/Makefile.in @@ -289,6 +289,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/usp/Makefile.in b/src/ulib/net/server/plugin/usp/Makefile.in index da82b948..0ac9ed8f 100644 --- a/src/ulib/net/server/plugin/usp/Makefile.in +++ b/src/ulib/net/server/plugin/usp/Makefile.in @@ -297,6 +297,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/net/server/plugin/usp/libFortune.cxx b/src/ulib/net/server/plugin/usp/libFortune.cxx index 4948f3ad..893e2807 100644 --- a/src/ulib/net/server/plugin/usp/libFortune.cxx +++ b/src/ulib/net/server/plugin/usp/libFortune.cxx @@ -13,7 +13,7 @@ PGconn* Fortune::conn; UPgSqlStatement* Fortune::pstmt; #endif -#ifdef DEBUG +#if defined(U_STDCPP_ENABLE) && defined(DEBUG) const char* Fortune::dump(bool breset) const { *UObjectIO::os << "id " << id << '\n' diff --git a/src/ulib/net/server/plugin/usp/libWorld.cxx b/src/ulib/net/server/plugin/usp/libWorld.cxx index 1699cec4..8e831d41 100644 --- a/src/ulib/net/server/plugin/usp/libWorld.cxx +++ b/src/ulib/net/server/plugin/usp/libWorld.cxx @@ -16,7 +16,7 @@ PGconn* World::conn; UPgSqlStatement* World::pstmt; #endif -#ifdef DEBUG +#if defined(U_STDCPP_ENABLE) && defined(DEBUG) const char* World::dump(bool breset) const { *UObjectIO::os << "id " << id << '\n' diff --git a/src/ulib/net/server/plugin/v8/Makefile.in b/src/ulib/net/server/plugin/v8/Makefile.in index 216d0a11..a8fc21b1 100644 --- a/src/ulib/net/server/plugin/v8/Makefile.in +++ b/src/ulib/net/server/plugin/v8/Makefile.in @@ -289,6 +289,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/orm/driver/Makefile.in b/src/ulib/orm/driver/Makefile.in index e486c561..2d62eae4 100644 --- a/src/ulib/orm/driver/Makefile.in +++ b/src/ulib/orm/driver/Makefile.in @@ -324,6 +324,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/src/ulib/orm/driver/libpq/Makefile.am b/src/ulib/orm/driver/libpq/Makefile.am index f3569bb0..4f0555c0 100644 --- a/src/ulib/orm/driver/libpq/Makefile.am +++ b/src/ulib/orm/driver/libpq/Makefile.am @@ -1,25 +1,16 @@ ## Makefile.am for libpq -EXTRA_DIST = *.c Makefile.* +EXTRA_DIST = *.c Makefile.* common config gssapi libpq mb nodes utils MAINTAINERCLEANFILES = Makefile.in -DEFAULT_INCLUDES = -I. -I$(top_srcdir)/include +DEFAULT_INCLUDES = -I. -I./config -I$(top_srcdir)/include DEFS = -D_GNU_SOURCE -D__USE_GNU -DFRONTEND -libpq_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ -I./config -libpq_la_LDFLAGS = @POSTGRESQL_LDFLAGS@ -libpq_la_LIBADD = @POSTGRESQL_LIBS@ libpq_la_SOURCES = base64.c chklocale.c encnames.c fe-auth-scram.c fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-print.c \ fe-protocol2.c fe-protocol3.c fe-secure.c getpeereid.c inet_net_ntop.c ip.c libpq-events.c md5.c noblock.c pg_strong_random.c \ - pgstrcasecmp.c pqexpbuffer.c pqsignal.c saslprep.c scram-common.c strlcpy.c thread.c unicode_norm.c wchar.c - -if POSTGRESQL_USE_OPENSSL -libpq_la_SOURCES += sha2_openssl.c fe-secure-openssl.c -else -libpq_la_SOURCES += sha2.c -endif + pgstrcasecmp.c pqexpbuffer.c pqsignal.c saslprep.c scram-common.c strlcpy.c thread.c unicode_norm.c wchar.c sha2.c ## for convenience library noinst_LTLIBRARIES = libpq.la diff --git a/src/ulib/orm/driver/libpq/Makefile.in b/src/ulib/orm/driver/libpq/Makefile.in index 765da947..59dc4500 100644 --- a/src/ulib/orm/driver/libpq/Makefile.in +++ b/src/ulib/orm/driver/libpq/Makefile.in @@ -79,8 +79,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@POSTGRESQL_USE_OPENSSL_TRUE@am__append_1 = sha2_openssl.c fe-secure-openssl.c -@POSTGRESQL_USE_OPENSSL_FALSE@am__append_2 = sha2.c subdir = src/ulib/orm/driver/libpq DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -110,40 +108,20 @@ CONFIG_HEADER = $(top_builddir)/include/ulib/internal/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libpq_la_DEPENDENCIES = -am__libpq_la_SOURCES_DIST = base64.c chklocale.c encnames.c \ - fe-auth-scram.c fe-auth.c fe-connect.c fe-exec.c fe-lobj.c \ - fe-misc.c fe-print.c fe-protocol2.c fe-protocol3.c fe-secure.c \ - getpeereid.c inet_net_ntop.c ip.c libpq-events.c md5.c \ - noblock.c pg_strong_random.c pgstrcasecmp.c pqexpbuffer.c \ - pqsignal.c saslprep.c scram-common.c strlcpy.c thread.c \ - unicode_norm.c wchar.c sha2_openssl.c fe-secure-openssl.c \ - sha2.c -@POSTGRESQL_USE_OPENSSL_TRUE@am__objects_1 = libpq_la-sha2_openssl.lo \ -@POSTGRESQL_USE_OPENSSL_TRUE@ libpq_la-fe-secure-openssl.lo -@POSTGRESQL_USE_OPENSSL_FALSE@am__objects_2 = libpq_la-sha2.lo -am_libpq_la_OBJECTS = libpq_la-base64.lo libpq_la-chklocale.lo \ - libpq_la-encnames.lo libpq_la-fe-auth-scram.lo \ - libpq_la-fe-auth.lo libpq_la-fe-connect.lo libpq_la-fe-exec.lo \ - libpq_la-fe-lobj.lo libpq_la-fe-misc.lo libpq_la-fe-print.lo \ - libpq_la-fe-protocol2.lo libpq_la-fe-protocol3.lo \ - libpq_la-fe-secure.lo libpq_la-getpeereid.lo \ - libpq_la-inet_net_ntop.lo libpq_la-ip.lo \ - libpq_la-libpq-events.lo libpq_la-md5.lo libpq_la-noblock.lo \ - libpq_la-pg_strong_random.lo libpq_la-pgstrcasecmp.lo \ - libpq_la-pqexpbuffer.lo libpq_la-pqsignal.lo \ - libpq_la-saslprep.lo libpq_la-scram-common.lo \ - libpq_la-strlcpy.lo libpq_la-thread.lo \ - libpq_la-unicode_norm.lo libpq_la-wchar.lo $(am__objects_1) \ - $(am__objects_2) +libpq_la_LIBADD = +am_libpq_la_OBJECTS = base64.lo chklocale.lo encnames.lo \ + fe-auth-scram.lo fe-auth.lo fe-connect.lo fe-exec.lo \ + fe-lobj.lo fe-misc.lo fe-print.lo fe-protocol2.lo \ + fe-protocol3.lo fe-secure.lo getpeereid.lo inet_net_ntop.lo \ + ip.lo libpq-events.lo md5.lo noblock.lo pg_strong_random.lo \ + pgstrcasecmp.lo pqexpbuffer.lo pqsignal.lo saslprep.lo \ + scram-common.lo strlcpy.lo thread.lo unicode_norm.lo wchar.lo \ + sha2.lo libpq_la_OBJECTS = $(am_libpq_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -libpq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libpq_la_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -178,7 +156,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libpq_la_SOURCES) -DIST_SOURCES = $(am__libpq_la_SOURCES_DIST) +DIST_SOURCES = $(libpq_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -286,6 +264,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ @@ -399,19 +380,13 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = *.c Makefile.* +EXTRA_DIST = *.c Makefile.* common config gssapi libpq mb nodes utils MAINTAINERCLEANFILES = Makefile.in -DEFAULT_INCLUDES = -I. -I$(top_srcdir)/include -libpq_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ -I./config -libpq_la_LDFLAGS = @POSTGRESQL_LDFLAGS@ -libpq_la_LIBADD = @POSTGRESQL_LIBS@ -libpq_la_SOURCES = base64.c chklocale.c encnames.c fe-auth-scram.c \ - fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c \ - fe-print.c fe-protocol2.c fe-protocol3.c fe-secure.c \ - getpeereid.c inet_net_ntop.c ip.c libpq-events.c md5.c \ - noblock.c pg_strong_random.c pgstrcasecmp.c pqexpbuffer.c \ - pqsignal.c saslprep.c scram-common.c strlcpy.c thread.c \ - unicode_norm.c wchar.c $(am__append_1) $(am__append_2) +DEFAULT_INCLUDES = -I. -I./config -I$(top_srcdir)/include +libpq_la_SOURCES = base64.c chklocale.c encnames.c fe-auth-scram.c fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-print.c \ + fe-protocol2.c fe-protocol3.c fe-secure.c getpeereid.c inet_net_ntop.c ip.c libpq-events.c md5.c noblock.c pg_strong_random.c \ + pgstrcasecmp.c pqexpbuffer.c pqsignal.c saslprep.c scram-common.c strlcpy.c thread.c unicode_norm.c wchar.c sha2.c + noinst_LTLIBRARIES = libpq.la all: all-am @@ -460,7 +435,7 @@ clean-noinstLTLIBRARIES: } libpq.la: $(libpq_la_OBJECTS) $(libpq_la_DEPENDENCIES) $(EXTRA_libpq_la_DEPENDENCIES) - $(AM_V_CCLD)$(libpq_la_LINK) $(libpq_la_OBJECTS) $(libpq_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libpq_la_OBJECTS) $(libpq_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -468,38 +443,36 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-base64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-chklocale.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-encnames.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-auth-scram.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-auth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-connect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-exec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-lobj.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-misc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-print.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-protocol2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-protocol3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-secure-openssl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-fe-secure.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-getpeereid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-inet_net_ntop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-ip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-libpq-events.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-md5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-noblock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-pg_strong_random.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-pgstrcasecmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-pqexpbuffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-pqsignal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-saslprep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-scram-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-sha2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-sha2_openssl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-strlcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-thread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-unicode_norm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq_la-wchar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chklocale.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encnames.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-auth-scram.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-auth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-connect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-exec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-lobj.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-misc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-print.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-protocol2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-protocol3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fe-secure.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpeereid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_net_ntop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ip.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpq-events.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noblock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pg_strong_random.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgstrcasecmp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pqexpbuffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pqsignal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saslprep.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scram-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode_norm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wchar.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -525,230 +498,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libpq_la-base64.lo: base64.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-base64.lo -MD -MP -MF $(DEPDIR)/libpq_la-base64.Tpo -c -o libpq_la-base64.lo `test -f 'base64.c' || echo '$(srcdir)/'`base64.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-base64.Tpo $(DEPDIR)/libpq_la-base64.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='base64.c' object='libpq_la-base64.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-base64.lo `test -f 'base64.c' || echo '$(srcdir)/'`base64.c - -libpq_la-chklocale.lo: chklocale.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-chklocale.lo -MD -MP -MF $(DEPDIR)/libpq_la-chklocale.Tpo -c -o libpq_la-chklocale.lo `test -f 'chklocale.c' || echo '$(srcdir)/'`chklocale.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-chklocale.Tpo $(DEPDIR)/libpq_la-chklocale.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='chklocale.c' object='libpq_la-chklocale.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-chklocale.lo `test -f 'chklocale.c' || echo '$(srcdir)/'`chklocale.c - -libpq_la-encnames.lo: encnames.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-encnames.lo -MD -MP -MF $(DEPDIR)/libpq_la-encnames.Tpo -c -o libpq_la-encnames.lo `test -f 'encnames.c' || echo '$(srcdir)/'`encnames.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-encnames.Tpo $(DEPDIR)/libpq_la-encnames.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='encnames.c' object='libpq_la-encnames.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-encnames.lo `test -f 'encnames.c' || echo '$(srcdir)/'`encnames.c - -libpq_la-fe-auth-scram.lo: fe-auth-scram.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-auth-scram.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-auth-scram.Tpo -c -o libpq_la-fe-auth-scram.lo `test -f 'fe-auth-scram.c' || echo '$(srcdir)/'`fe-auth-scram.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-auth-scram.Tpo $(DEPDIR)/libpq_la-fe-auth-scram.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-auth-scram.c' object='libpq_la-fe-auth-scram.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-auth-scram.lo `test -f 'fe-auth-scram.c' || echo '$(srcdir)/'`fe-auth-scram.c - -libpq_la-fe-auth.lo: fe-auth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-auth.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-auth.Tpo -c -o libpq_la-fe-auth.lo `test -f 'fe-auth.c' || echo '$(srcdir)/'`fe-auth.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-auth.Tpo $(DEPDIR)/libpq_la-fe-auth.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-auth.c' object='libpq_la-fe-auth.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-auth.lo `test -f 'fe-auth.c' || echo '$(srcdir)/'`fe-auth.c - -libpq_la-fe-connect.lo: fe-connect.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-connect.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-connect.Tpo -c -o libpq_la-fe-connect.lo `test -f 'fe-connect.c' || echo '$(srcdir)/'`fe-connect.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-connect.Tpo $(DEPDIR)/libpq_la-fe-connect.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-connect.c' object='libpq_la-fe-connect.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-connect.lo `test -f 'fe-connect.c' || echo '$(srcdir)/'`fe-connect.c - -libpq_la-fe-exec.lo: fe-exec.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-exec.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-exec.Tpo -c -o libpq_la-fe-exec.lo `test -f 'fe-exec.c' || echo '$(srcdir)/'`fe-exec.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-exec.Tpo $(DEPDIR)/libpq_la-fe-exec.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-exec.c' object='libpq_la-fe-exec.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-exec.lo `test -f 'fe-exec.c' || echo '$(srcdir)/'`fe-exec.c - -libpq_la-fe-lobj.lo: fe-lobj.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-lobj.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-lobj.Tpo -c -o libpq_la-fe-lobj.lo `test -f 'fe-lobj.c' || echo '$(srcdir)/'`fe-lobj.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-lobj.Tpo $(DEPDIR)/libpq_la-fe-lobj.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-lobj.c' object='libpq_la-fe-lobj.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-lobj.lo `test -f 'fe-lobj.c' || echo '$(srcdir)/'`fe-lobj.c - -libpq_la-fe-misc.lo: fe-misc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-misc.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-misc.Tpo -c -o libpq_la-fe-misc.lo `test -f 'fe-misc.c' || echo '$(srcdir)/'`fe-misc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-misc.Tpo $(DEPDIR)/libpq_la-fe-misc.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-misc.c' object='libpq_la-fe-misc.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-misc.lo `test -f 'fe-misc.c' || echo '$(srcdir)/'`fe-misc.c - -libpq_la-fe-print.lo: fe-print.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-print.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-print.Tpo -c -o libpq_la-fe-print.lo `test -f 'fe-print.c' || echo '$(srcdir)/'`fe-print.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-print.Tpo $(DEPDIR)/libpq_la-fe-print.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-print.c' object='libpq_la-fe-print.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-print.lo `test -f 'fe-print.c' || echo '$(srcdir)/'`fe-print.c - -libpq_la-fe-protocol2.lo: fe-protocol2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-protocol2.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-protocol2.Tpo -c -o libpq_la-fe-protocol2.lo `test -f 'fe-protocol2.c' || echo '$(srcdir)/'`fe-protocol2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-protocol2.Tpo $(DEPDIR)/libpq_la-fe-protocol2.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-protocol2.c' object='libpq_la-fe-protocol2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-protocol2.lo `test -f 'fe-protocol2.c' || echo '$(srcdir)/'`fe-protocol2.c - -libpq_la-fe-protocol3.lo: fe-protocol3.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-protocol3.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-protocol3.Tpo -c -o libpq_la-fe-protocol3.lo `test -f 'fe-protocol3.c' || echo '$(srcdir)/'`fe-protocol3.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-protocol3.Tpo $(DEPDIR)/libpq_la-fe-protocol3.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-protocol3.c' object='libpq_la-fe-protocol3.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-protocol3.lo `test -f 'fe-protocol3.c' || echo '$(srcdir)/'`fe-protocol3.c - -libpq_la-fe-secure.lo: fe-secure.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-secure.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-secure.Tpo -c -o libpq_la-fe-secure.lo `test -f 'fe-secure.c' || echo '$(srcdir)/'`fe-secure.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-secure.Tpo $(DEPDIR)/libpq_la-fe-secure.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-secure.c' object='libpq_la-fe-secure.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-secure.lo `test -f 'fe-secure.c' || echo '$(srcdir)/'`fe-secure.c - -libpq_la-getpeereid.lo: getpeereid.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-getpeereid.lo -MD -MP -MF $(DEPDIR)/libpq_la-getpeereid.Tpo -c -o libpq_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-getpeereid.Tpo $(DEPDIR)/libpq_la-getpeereid.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getpeereid.c' object='libpq_la-getpeereid.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c - -libpq_la-inet_net_ntop.lo: inet_net_ntop.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-inet_net_ntop.lo -MD -MP -MF $(DEPDIR)/libpq_la-inet_net_ntop.Tpo -c -o libpq_la-inet_net_ntop.lo `test -f 'inet_net_ntop.c' || echo '$(srcdir)/'`inet_net_ntop.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-inet_net_ntop.Tpo $(DEPDIR)/libpq_la-inet_net_ntop.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inet_net_ntop.c' object='libpq_la-inet_net_ntop.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-inet_net_ntop.lo `test -f 'inet_net_ntop.c' || echo '$(srcdir)/'`inet_net_ntop.c - -libpq_la-ip.lo: ip.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-ip.lo -MD -MP -MF $(DEPDIR)/libpq_la-ip.Tpo -c -o libpq_la-ip.lo `test -f 'ip.c' || echo '$(srcdir)/'`ip.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-ip.Tpo $(DEPDIR)/libpq_la-ip.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ip.c' object='libpq_la-ip.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-ip.lo `test -f 'ip.c' || echo '$(srcdir)/'`ip.c - -libpq_la-libpq-events.lo: libpq-events.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-libpq-events.lo -MD -MP -MF $(DEPDIR)/libpq_la-libpq-events.Tpo -c -o libpq_la-libpq-events.lo `test -f 'libpq-events.c' || echo '$(srcdir)/'`libpq-events.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-libpq-events.Tpo $(DEPDIR)/libpq_la-libpq-events.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libpq-events.c' object='libpq_la-libpq-events.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-libpq-events.lo `test -f 'libpq-events.c' || echo '$(srcdir)/'`libpq-events.c - -libpq_la-md5.lo: md5.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-md5.lo -MD -MP -MF $(DEPDIR)/libpq_la-md5.Tpo -c -o libpq_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-md5.Tpo $(DEPDIR)/libpq_la-md5.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5.c' object='libpq_la-md5.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c - -libpq_la-noblock.lo: noblock.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-noblock.lo -MD -MP -MF $(DEPDIR)/libpq_la-noblock.Tpo -c -o libpq_la-noblock.lo `test -f 'noblock.c' || echo '$(srcdir)/'`noblock.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-noblock.Tpo $(DEPDIR)/libpq_la-noblock.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='noblock.c' object='libpq_la-noblock.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-noblock.lo `test -f 'noblock.c' || echo '$(srcdir)/'`noblock.c - -libpq_la-pg_strong_random.lo: pg_strong_random.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-pg_strong_random.lo -MD -MP -MF $(DEPDIR)/libpq_la-pg_strong_random.Tpo -c -o libpq_la-pg_strong_random.lo `test -f 'pg_strong_random.c' || echo '$(srcdir)/'`pg_strong_random.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-pg_strong_random.Tpo $(DEPDIR)/libpq_la-pg_strong_random.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pg_strong_random.c' object='libpq_la-pg_strong_random.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-pg_strong_random.lo `test -f 'pg_strong_random.c' || echo '$(srcdir)/'`pg_strong_random.c - -libpq_la-pgstrcasecmp.lo: pgstrcasecmp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-pgstrcasecmp.lo -MD -MP -MF $(DEPDIR)/libpq_la-pgstrcasecmp.Tpo -c -o libpq_la-pgstrcasecmp.lo `test -f 'pgstrcasecmp.c' || echo '$(srcdir)/'`pgstrcasecmp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-pgstrcasecmp.Tpo $(DEPDIR)/libpq_la-pgstrcasecmp.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pgstrcasecmp.c' object='libpq_la-pgstrcasecmp.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-pgstrcasecmp.lo `test -f 'pgstrcasecmp.c' || echo '$(srcdir)/'`pgstrcasecmp.c - -libpq_la-pqexpbuffer.lo: pqexpbuffer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-pqexpbuffer.lo -MD -MP -MF $(DEPDIR)/libpq_la-pqexpbuffer.Tpo -c -o libpq_la-pqexpbuffer.lo `test -f 'pqexpbuffer.c' || echo '$(srcdir)/'`pqexpbuffer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-pqexpbuffer.Tpo $(DEPDIR)/libpq_la-pqexpbuffer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pqexpbuffer.c' object='libpq_la-pqexpbuffer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-pqexpbuffer.lo `test -f 'pqexpbuffer.c' || echo '$(srcdir)/'`pqexpbuffer.c - -libpq_la-pqsignal.lo: pqsignal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-pqsignal.lo -MD -MP -MF $(DEPDIR)/libpq_la-pqsignal.Tpo -c -o libpq_la-pqsignal.lo `test -f 'pqsignal.c' || echo '$(srcdir)/'`pqsignal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-pqsignal.Tpo $(DEPDIR)/libpq_la-pqsignal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pqsignal.c' object='libpq_la-pqsignal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-pqsignal.lo `test -f 'pqsignal.c' || echo '$(srcdir)/'`pqsignal.c - -libpq_la-saslprep.lo: saslprep.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-saslprep.lo -MD -MP -MF $(DEPDIR)/libpq_la-saslprep.Tpo -c -o libpq_la-saslprep.lo `test -f 'saslprep.c' || echo '$(srcdir)/'`saslprep.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-saslprep.Tpo $(DEPDIR)/libpq_la-saslprep.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='saslprep.c' object='libpq_la-saslprep.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-saslprep.lo `test -f 'saslprep.c' || echo '$(srcdir)/'`saslprep.c - -libpq_la-scram-common.lo: scram-common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-scram-common.lo -MD -MP -MF $(DEPDIR)/libpq_la-scram-common.Tpo -c -o libpq_la-scram-common.lo `test -f 'scram-common.c' || echo '$(srcdir)/'`scram-common.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-scram-common.Tpo $(DEPDIR)/libpq_la-scram-common.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scram-common.c' object='libpq_la-scram-common.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-scram-common.lo `test -f 'scram-common.c' || echo '$(srcdir)/'`scram-common.c - -libpq_la-strlcpy.lo: strlcpy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libpq_la-strlcpy.Tpo -c -o libpq_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-strlcpy.Tpo $(DEPDIR)/libpq_la-strlcpy.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strlcpy.c' object='libpq_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c - -libpq_la-thread.lo: thread.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-thread.lo -MD -MP -MF $(DEPDIR)/libpq_la-thread.Tpo -c -o libpq_la-thread.lo `test -f 'thread.c' || echo '$(srcdir)/'`thread.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-thread.Tpo $(DEPDIR)/libpq_la-thread.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thread.c' object='libpq_la-thread.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-thread.lo `test -f 'thread.c' || echo '$(srcdir)/'`thread.c - -libpq_la-unicode_norm.lo: unicode_norm.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-unicode_norm.lo -MD -MP -MF $(DEPDIR)/libpq_la-unicode_norm.Tpo -c -o libpq_la-unicode_norm.lo `test -f 'unicode_norm.c' || echo '$(srcdir)/'`unicode_norm.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-unicode_norm.Tpo $(DEPDIR)/libpq_la-unicode_norm.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unicode_norm.c' object='libpq_la-unicode_norm.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-unicode_norm.lo `test -f 'unicode_norm.c' || echo '$(srcdir)/'`unicode_norm.c - -libpq_la-wchar.lo: wchar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-wchar.lo -MD -MP -MF $(DEPDIR)/libpq_la-wchar.Tpo -c -o libpq_la-wchar.lo `test -f 'wchar.c' || echo '$(srcdir)/'`wchar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-wchar.Tpo $(DEPDIR)/libpq_la-wchar.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wchar.c' object='libpq_la-wchar.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-wchar.lo `test -f 'wchar.c' || echo '$(srcdir)/'`wchar.c - -libpq_la-sha2_openssl.lo: sha2_openssl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-sha2_openssl.lo -MD -MP -MF $(DEPDIR)/libpq_la-sha2_openssl.Tpo -c -o libpq_la-sha2_openssl.lo `test -f 'sha2_openssl.c' || echo '$(srcdir)/'`sha2_openssl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-sha2_openssl.Tpo $(DEPDIR)/libpq_la-sha2_openssl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sha2_openssl.c' object='libpq_la-sha2_openssl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-sha2_openssl.lo `test -f 'sha2_openssl.c' || echo '$(srcdir)/'`sha2_openssl.c - -libpq_la-fe-secure-openssl.lo: fe-secure-openssl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-fe-secure-openssl.lo -MD -MP -MF $(DEPDIR)/libpq_la-fe-secure-openssl.Tpo -c -o libpq_la-fe-secure-openssl.lo `test -f 'fe-secure-openssl.c' || echo '$(srcdir)/'`fe-secure-openssl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-fe-secure-openssl.Tpo $(DEPDIR)/libpq_la-fe-secure-openssl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fe-secure-openssl.c' object='libpq_la-fe-secure-openssl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-fe-secure-openssl.lo `test -f 'fe-secure-openssl.c' || echo '$(srcdir)/'`fe-secure-openssl.c - -libpq_la-sha2.lo: sha2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpq_la-sha2.lo -MD -MP -MF $(DEPDIR)/libpq_la-sha2.Tpo -c -o libpq_la-sha2.lo `test -f 'sha2.c' || echo '$(srcdir)/'`sha2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpq_la-sha2.Tpo $(DEPDIR)/libpq_la-sha2.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sha2.c' object='libpq_la-sha2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpq_la-sha2.lo `test -f 'sha2.c' || echo '$(srcdir)/'`sha2.c - mostlyclean-libtool: -rm -f *.lo diff --git a/src/ulib/orm/driver/libpq/fe-exec.c b/src/ulib/orm/driver/libpq/fe-exec.c index 8cb8b62e..b19a4cc0 100644 --- a/src/ulib/orm/driver/libpq/fe-exec.c +++ b/src/ulib/orm/driver/libpq/fe-exec.c @@ -1780,16 +1780,16 @@ PQsendQueryGuts(PGconn *conn, if (conn->queue_status != PQQUEUE_MODE_OFF) PQappendPipelinedCommand(conn, pipeCmd); else - { - /* - * Give the data a push. In nonblock mode, don't complain if we're unable - * to send it all; PQgetResult() will do any additional flushing needed. - */ - if (pqQueueFlush(conn) < 0) - goto sendFailed; + { + /* + * Give the data a push. In nonblock mode, don't complain if we're unable + * to send it all; PQgetResult() will do any additional flushing needed. + */ + if (pqQueueFlush(conn) < 0) + goto sendFailed; conn->asyncStatus = PGASYNC_BUSY; - } + } return 1; sendFailed: diff --git a/src/ulib/utility/uhttp.cpp b/src/ulib/utility/uhttp.cpp index a2cbb4e7..ac65f981 100644 --- a/src/ulib/utility/uhttp.cpp +++ b/src/ulib/utility/uhttp.cpp @@ -9110,6 +9110,8 @@ U_NO_EXPORT void UHTTP::manageDataForCache(const UString& basename, const UStrin if ( usp_src || (usp_dll = suffix.equal(U_CONSTANT_TO_PARAM(U_LIB_SUFFIX)))) { + UHTTP::UFileCacheData* file_data_src; + file_data->mime_index = U_usp; if (usp_src) @@ -9118,6 +9120,8 @@ U_NO_EXPORT void UHTTP::manageDataForCache(const UString& basename, const UStrin cache_file->insert(lpathname, file_data); + file_data_src = file_data; + U_NEW(UHTTP::UFileCacheData, file_data, UHTTP::UFileCacheData); file_data->size = file->st_size; @@ -9174,6 +9178,14 @@ U_NO_EXPORT void UHTTP::manageDataForCache(const UString& basename, const UStrin file_data->ptr = usp; + if (usp_src && + usp_found == false) + { + U_INTERNAL_ASSERT_POINTER(file_data_src) + + file_data_src->ptr = usp; + } + U_SRV_LOG("USP found: %V, USP service registered (URI): %V", basename.rep, lpathname.rep); } # ifdef HAVE_LIBTCC diff --git a/tests/Makefile.in b/tests/Makefile.in index ccd7fb5e..b2710712 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -272,6 +272,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/base/Makefile.in b/tests/base/Makefile.in index 89c451da..6423776c 100644 --- a/tests/base/Makefile.in +++ b/tests/base/Makefile.in @@ -544,6 +544,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/contrib/Makefile.in b/tests/contrib/Makefile.in index 17e1d4b1..00a2f577 100644 --- a/tests/contrib/Makefile.in +++ b/tests/contrib/Makefile.in @@ -415,6 +415,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/debug/Makefile.in b/tests/debug/Makefile.in index 48f3a3ab..0a54f464 100644 --- a/tests/debug/Makefile.in +++ b/tests/debug/Makefile.in @@ -484,6 +484,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in index dc95db4a..30175ea1 100644 --- a/tests/examples/Makefile.in +++ b/tests/examples/Makefile.in @@ -500,6 +500,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/examples/TSA/tsaserial b/tests/examples/TSA/tsaserial index 11b731e0..cb83f154 100644 --- a/tests/examples/TSA/tsaserial +++ b/tests/examples/TSA/tsaserial @@ -1 +1 @@ -036D +0374 diff --git a/tests/ulib/Makefile.in b/tests/ulib/Makefile.in index 9e2541e5..5841b864 100644 --- a/tests/ulib/Makefile.in +++ b/tests/ulib/Makefile.in @@ -985,6 +985,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/ulib/http2/Makefile.in b/tests/ulib/http2/Makefile.in index 04e4697b..aa5fbeba 100644 --- a/tests/ulib/http2/Makefile.in +++ b/tests/ulib/http2/Makefile.in @@ -468,6 +468,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAGESPEED_ROOT_DIR = @PAGESPEED_ROOT_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PG_CONFIG = @PG_CONFIG@ +PG_CONFIG_CPPFLAGS = @PG_CONFIG_CPPFLAGS@ +PG_CONFIG_LDFLAGS = @PG_CONFIG_LDFLAGS@ +PG_CONFIG_LIBS = @PG_CONFIG_LIBS@ PHPCONFIG = @PHPCONFIG@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ diff --git a/tests/ulib/plugin/product1.cpp b/tests/ulib/plugin/product1.cpp index 63f855cb..57a3ed31 100644 --- a/tests/ulib/plugin/product1.cpp +++ b/tests/ulib/plugin/product1.cpp @@ -7,7 +7,14 @@ public: Product1() {} virtual ~Product1() { (void) write(1, U_CONSTANT_TO_PARAM("distruttore Product1\n")); } - virtual void print(ostream& os) const { os.write(U_CONSTANT_TO_PARAM("I am Product1\n")); } + virtual void print(ostream& os) const + { +# if defined(U_STDCPP_ENABLE) + os.write(U_CONSTANT_TO_PARAM("I am Product1\n")); +# else + (void) write(1, U_CONSTANT_TO_PARAM("I am Product1\n")); +# endif + } }; U_CREAT_FUNC(product1, Product1) diff --git a/tests/ulib/plugin/product2.cpp b/tests/ulib/plugin/product2.cpp index d1b04464..dab2d4e0 100644 --- a/tests/ulib/plugin/product2.cpp +++ b/tests/ulib/plugin/product2.cpp @@ -7,7 +7,14 @@ public: Product2() {} virtual ~Product2() { (void) write(1, U_CONSTANT_TO_PARAM("distruttore Product2\n")); } - virtual void print(ostream& os) const { os.write(U_CONSTANT_TO_PARAM("I am Product2\n")); } + virtual void print(ostream& os) const + { +# if defined(U_STDCPP_ENABLE) + os.write(U_CONSTANT_TO_PARAM("I am Product2\n")); +# else + (void) write(1, U_CONSTANT_TO_PARAM("I am Product2\n")); +# endif + } }; U_CREAT_FUNC(product2, Product2)