From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 31 Dec 2008 09:56:32 +0000 (+0100)
Subject: Merge from Michael:
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=17729ec9c0bf14902f10e211dc5fc4547d38350f;p=dak.git

Merge from Michael:

Fixed sql-qptvc.cpp to work on modern postgresql versions,
and made the makefile be less braindead

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
(cherry picked from commit 8e2d5f69dc3519cff036b34e6e7ce3956088f7e1)

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/ChangeLog b/ChangeLog
index 946cf32a..2bee6205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-30  Michael Casadevall  <sonicmctails@gmail.com>
+
+	* src/sql-aptvc.cpp	- Fixed to work on modern postgresql version
+	* src/Makefile		- Gave it a brain on finding postgres headers
+
 2008-12-30  Joerg Jaspert  <joerg@debian.org>
 
 	* config/debian/cron.hourly: Generate the 822 format for accepted,
diff --git a/src/Makefile b/src/Makefile
index b45b07d8..206f320b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-CXXFLAGS	= -I/usr/include/postgresql/ -I/usr/include/postgresql/server/ -fPIC -Wall
-CFLAGS		= -fPIC -Wall
-LDFLAGS		= -fPIC
-LIBS		= -lapt-pkg
+CXXFLAGS	= -I/usr/include/postgresql/ -I`pg_config --includedir-server` -fPIC -Wall
+CFLAGS		= -fFIC -Wall `pg_config --cflags`
+LDFLAGS		= `pg_config --ldflags`
+LIBS		= -lapt-pkg `pg_config --libs`
 
 C++		= g++
 
diff --git a/src/sql-aptvc.cpp b/src/sql-aptvc.cpp
index 54ba9e92..a9c3e53e 100644
--- a/src/sql-aptvc.cpp
+++ b/src/sql-aptvc.cpp
@@ -26,6 +26,11 @@ extern "C"
 {
 
 #include <postgres.h>
+#include <fmgr.h>
+
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
+#endif
 
   int versioncmp(text *A, text *B);