freebsd configure fix

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@23 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/configure.in b/configure.in
index d05dee6bca7c1835bc348e6785c11b1c1b7c9a02..c1e603d1aa1f54c555730ae97f0429ef100b6058 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl intro
 AC_INIT(pdns/receiver.cc)
 AM_INIT_AUTOMAKE(pdns, 2.9.1)
+AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
 CXXFLAGS="-Wall -pthread -O2"
 

diff --git a/modules/gmysqlbackend/Makefile b/modules/gmysqlbackend/Makefile
index d091c7738590c46d2e5e3f9264756416efdaf52e..40a75500ff04cbcf1a7e753860809a844a692c48 100644 (file)
--- a/modules/gmysqlbackend/Makefile
+++ b/modules/gmysqlbackend/Makefile
@@ -3,19 +3,20 @@ PDNS_HOME             = ../../pdns
 PDNS_LIBDIR            = /usr/lib/powerdns
 
 MYSQL_INCLUDES      = /usr/include/mysql
-MYSQL_LIBDIR         = ./
+MYSQL_LIB            = 
 MYSQL_LIBS           = -lmysqlclient 
 
-POSTGRES_INCLUDES      = /opt/postgresql/include
-POSTGRES_LIBDIR         = /opt/postgresql-with-3.2/lib
-POSTGRES_LIBS           = -Wl,-Bstatic  -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto
+#POSTGRES_INCLUDES     = /opt/postgresql/include
+#POSTGRES_LIBDIR         = /opt/postgresql-with-3.2/lib
+#POSTGRES_LIBS           = -Wl,-Bstatic  -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto
+
 VERSION                        = 2.9
 
-all: libgmysqlbackend.so smysql.o
+all: gmysqlbackend.o smysql.o
 
-CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) -I$(POSTGRES_INCLUDES)
+CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) # -I$(POSTGRES_INCLUDES)
 
-LIBS= -L$(POSTGRES_LIBDIR) -L$(MYSQL_LIBDIR)  $(MYSQL_LIBS)  $(POSTGRES_LIBS)
+LIBS=  $(MYSQL_LIB)  $(MYSQL_LIBS) # -L$(POSTGRES_LIBDIR)  $(POSTGRES_LIBS)
 DIRNAME=pdns-gmypgsqlbackend-$(VERSION)
 
 PACKAGE = pdns
@@ -48,8 +49,8 @@ deps:
 -include deps
 
 
-libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o 
-       g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared  -o libgmysqlbackend.so 
+#libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o 
+#      g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared  -o libgmysqlbackend.so 
 
 .cc.o:
        g++ -MD -g -c $(CXXFLAGS) $(CPPFLAGS) $<

diff --git a/modules/gmysqlbackend/Makefile.in b/modules/gmysqlbackend/Makefile.in
index ae8f9443c25d01da5c03590d4d514a934833bd00..b3350e05c3a89ee0facb30850e9361ffd7e3eff1 100644 (file)
--- a/modules/gmysqlbackend/Makefile.in
+++ b/modules/gmysqlbackend/Makefile.in
@@ -1,20 +1,21 @@
 PDNS_HOME              = ../../pdns
 PDNS_LIBDIR            = /usr/lib/powerdns
 
-MYSQL_INCLUDES      = /usr/include/mysql
-MYSQL_LIBDIR         = ./
+MYSQL_INCLUDES      = @MYSQL_incdir@
+MYSQL_LIB            = @MYSQL_lib@
 MYSQL_LIBS           = -lmysqlclient 
 
-POSTGRES_INCLUDES      = /opt/postgresql/include
-POSTGRES_LIBDIR         = /opt/postgresql-with-3.2/lib
-POSTGRES_LIBS           = -Wl,-Bstatic  -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto
+#POSTGRES_INCLUDES     = /opt/postgresql/include
+#POSTGRES_LIBDIR         = /opt/postgresql-with-3.2/lib
+#POSTGRES_LIBS           = -Wl,-Bstatic  -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto
+
 VERSION                        = 2.9
 
-all: libgmysqlbackend.so smysql.o
+all: gmysqlbackend.o smysql.o
 
-CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) -I$(POSTGRES_INCLUDES)
+CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) # -I$(POSTGRES_INCLUDES)
 
-LIBS= -L$(POSTGRES_LIBDIR) -L$(MYSQL_LIBDIR)  $(MYSQL_LIBS)  $(POSTGRES_LIBS)
+LIBS=  $(MYSQL_LIB)  $(MYSQL_LIBS) # -L$(POSTGRES_LIBDIR)  $(POSTGRES_LIBS)
 DIRNAME=pdns-gmypgsqlbackend-$(VERSION)
 
 PACKAGE = @PACKAGE@
@@ -47,8 +48,8 @@ deps:
 -include deps
 
 
-libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o 
-       g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared  -o libgmysqlbackend.so 
+#libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o 
+#      g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared  -o libgmysqlbackend.so 
 
 .cc.o:
        g++ -MD -g -c $(CXXFLAGS) $(CPPFLAGS) $<