From a71808f6c5619d4f3822dda3c5cb4b32196d1b36 Mon Sep 17 00:00:00 2001 From: Bert Hubert Date: Fri, 29 Nov 2002 14:54:36 +0000 Subject: [PATCH] freebsd configure fix git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@23 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- configure.in | 1 + modules/gmysqlbackend/Makefile | 19 ++++++++++--------- modules/gmysqlbackend/Makefile.in | 21 +++++++++++---------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index d05dee6bc..c1e603d1a 100644 --- 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 d091c7738..40a75500f 100644 --- 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 ae8f9443c..b3350e05c 100644 --- 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) $< -- 2.49.0