Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 289 → Rev 290

/trunk/debian/changelog
5,8 → 5,10
* Drop support for GTK+ 2 (Closes: #885673).
* no_nostartfiles.patch: Don't use -nostartfiles when linking shared
modules (Closes: #892574). Thanks to Adrian Bunk.
* postgres_10_detect.patch (from upstream): Detect Postgres 10.x and
later.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2018 17:12:38 +0200
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2018 22:24:56 +0200
 
pike8.0 (8.0.498-1) unstable; urgency=low
 
/trunk/debian/patches/postgres_10_detect.patch
0,0 → 1,49
From: Henrik Grubbström <grubba@grubba.org>
Date: Tue, 20 Sep 2016 15:53:02 +0200
Subject: [PATCH] Build [Postgres]: Detect Postgres 10.x and later.
Origin: upstream, commit:0c397325d9de6f8bcb28020adc55e2c15b300955
 
--- a/src/modules/Postgres/configure.in
+++ b/src/modules/Postgres/configure.in
@@ -112,7 +112,7 @@ dnl see if we can find the include files in any of the standard locations
fi
fi
-dnl final ckeck, just to be sure we did not mess up
+dnl final check, just to be sure we did not mess up
AC_CHECK_HEADERS(postgres.h postgres_fe.h \
server/postgres.h server/postgres_fe.h \
postgresql/server/postgres.h \
@@ -137,6 +137,7 @@ PG_VERSION
HAVE_PG72=yes
AC_DEFINE(HAVE_PG72)
], [
+ # Detect Postgres 8.x and 9.x.
AC_EGREP_CPP([\"[8-9]\..*], [
#ifdef HAVE_POSTGRESQL_SERVER_PG_CONFIG_H
#include <postgresql/server/pg_config.h>
@@ -149,6 +150,21 @@ PG_VERSION
], [
HAVE_PG72=yes
AC_DEFINE(HAVE_PG72)
+ ], [
+ # Detect Postgres 10.x and anything later.
+ AC_EGREP_CPP([\"[1-9][0-9][0-9]*\..*], [
+#ifdef HAVE_POSTGRESQL_SERVER_PG_CONFIG_H
+#include <postgresql/server/pg_config.h>
+#elif defined(HAVE_SERVER_PG_CONFIG_H)
+#include <server/pg_config.h>
+#elif defined(HAVE_PG_CONFIG_H)
+#include <pg_config.h>
+#endif
+PG_VERSION
+ ], [
+ HAVE_PG72=yes
+ AC_DEFINE(HAVE_PG72)
+ ])
])
])
--
2.17.1