Changeset 23
- Timestamp:
- 11/29/02 15:54:36 (10 years ago)
- Location:
- trunk/pdns
- Files:
-
- 3 modified
-
configure.in (modified) (1 diff)
-
modules/gmysqlbackend/Makefile (modified) (2 diffs)
-
modules/gmysqlbackend/Makefile.in (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/pdns/configure.in
r21 r23 2 2 AC_INIT(pdns/receiver.cc) 3 3 AM_INIT_AUTOMAKE(pdns, 2.9.1) 4 AC_CANONICAL_HOST 4 5 AM_CONFIG_HEADER(config.h) 5 6 CXXFLAGS="-Wall -pthread -O2" -
trunk/pdns/modules/gmysqlbackend/Makefile
r21 r23 4 4 5 5 MYSQL_INCLUDES = /usr/include/mysql 6 MYSQL_LIB DIR = ./6 MYSQL_LIB = 7 7 MYSQL_LIBS = -lmysqlclient 8 8 9 POSTGRES_INCLUDES = /opt/postgresql/include 10 POSTGRES_LIBDIR = /opt/postgresql-with-3.2/lib 11 POSTGRES_LIBS = -Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto 9 #POSTGRES_INCLUDES = /opt/postgresql/include 10 #POSTGRES_LIBDIR = /opt/postgresql-with-3.2/lib 11 #POSTGRES_LIBS = -Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto 12 12 13 VERSION = 2.9 13 14 14 all: libgmysqlbackend.so smysql.o15 all: gmysqlbackend.o smysql.o 15 16 16 CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) -I$(POSTGRES_INCLUDES)17 CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) # -I$(POSTGRES_INCLUDES) 17 18 18 LIBS= -L$(POSTGRES_LIBDIR) -L$(MYSQL_LIBDIR) $(MYSQL_LIBS) $(POSTGRES_LIBS)19 LIBS= $(MYSQL_LIB) $(MYSQL_LIBS) # -L$(POSTGRES_LIBDIR) $(POSTGRES_LIBS) 19 20 DIRNAME=pdns-gmypgsqlbackend-$(VERSION) 20 21 … … 49 50 50 51 51 libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o52 g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared -o libgmysqlbackend.so52 #libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o 53 # g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared -o libgmysqlbackend.so 53 54 54 55 .cc.o: -
trunk/pdns/modules/gmysqlbackend/Makefile.in
r22 r23 2 2 PDNS_LIBDIR = /usr/lib/powerdns 3 3 4 MYSQL_INCLUDES = /usr/include/mysql5 MYSQL_LIB DIR = ./4 MYSQL_INCLUDES = @MYSQL_incdir@ 5 MYSQL_LIB = @MYSQL_lib@ 6 6 MYSQL_LIBS = -lmysqlclient 7 7 8 POSTGRES_INCLUDES = /opt/postgresql/include 9 POSTGRES_LIBDIR = /opt/postgresql-with-3.2/lib 10 POSTGRES_LIBS = -Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto 8 #POSTGRES_INCLUDES = /opt/postgresql/include 9 #POSTGRES_LIBDIR = /opt/postgresql-with-3.2/lib 10 #POSTGRES_LIBS = -Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto 11 11 12 VERSION = 2.9 12 13 13 all: libgmysqlbackend.so smysql.o14 all: gmysqlbackend.o smysql.o 14 15 15 CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) -I$(POSTGRES_INCLUDES)16 CPPFLAGS=-I$(PDNS_HOME) -I$(MYSQL_INCLUDES) # -I$(POSTGRES_INCLUDES) 16 17 17 LIBS= -L$(POSTGRES_LIBDIR) -L$(MYSQL_LIBDIR) $(MYSQL_LIBS) $(POSTGRES_LIBS)18 LIBS= $(MYSQL_LIB) $(MYSQL_LIBS) # -L$(POSTGRES_LIBDIR) $(POSTGRES_LIBS) 18 19 DIRNAME=pdns-gmypgsqlbackend-$(VERSION) 19 20 … … 48 49 49 50 50 libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o51 g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared -o libgmysqlbackend.so51 #libgmysqlbackend.so: gmysqlbackend.o smysql.o spgsql.o 52 # g++ gmysqlbackend.o -Wl,-rpath -Wl,$(POSTGRES_LIBDIR) smysql.o spgsql.o $(LIBS) -Wl,-soname -Wl,libgmysqlbackend.so.0 -shared -o libgmysqlbackend.so 52 53 53 54 .cc.o: