Changeset 82

Timestamp:

12/17/02 11:39:53 (10 years ago)

Author:

ahu

Message:

random stuff

Location:

trunk/pdns

Files:

• Makefile.am (modified) (1 diff)
• build-scripts (added)
• build-scripts/rpm-build-instruction (added)
• build-scripts/tar-gz-build-instruction (added)
• configure.in (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• modules/gpgsqlbackend/Makefile.am (modified) (1 diff)
• modules/gpgsqlbackend/spgsql.cc (modified) (1 diff)
• modules/xdbbackend/Makefile.in (modified) (3 diffs)
• pdns/Makefile.am (modified) (1 diff)
• rpm-build-instruction (deleted)

trunk/pdns/Makefile.am

@@ -1 @@
-SUBDIRS=modules pdns
+SUBDIRS=modules @programdescend@
 EXTRA_DIST=TODO WARNING README HACKING INSTALL ChangeLog debian pdns.spec
 

trunk/pdns/configure.in

@@ -189 +189 @@
 AC_SUBST(modulelibs)
 
+AC_MSG_CHECKING(whether we will be building the server)
+AC_ARG_ENABLE(pdns-server, 
+ [  --enable-pdns_server        If we should build the server],
+        enable_pdns_server=$enableval,
+        enable_pdns_server=yes)
+
+AC_MSG_RESULT($enable_pdns_server)
+
+if test x"$enable_pdns_server" = "xyes"
+then 
+        programdescend=pdns
+fi
+
+AC_SUBST(programdescend)
+
 for a in $modules $dynmodules
 do
@@ -330 +345 @@
 fi
 
-rm -f $srcdir/modules/pgmysqlbackend/OBJECTFILES $srcdir/modules/pgmysqlbackend/OBJECTLIBS
 
 for a in $modules
 do
         moduledirs="$moduledirs ${a}backend"
-
-        case "$a" in
-                pgmysql)
-
-                echo -n "gmysqlbackend.o " >  $srcdir/modules/pgmysqlbackend/OBJECTFILES
-                if test x"$domysql" = xyes
-                then 
-                        echo -n "smysql.o " >> $srcdir/modules/pgmysqlbackend/OBJECTFILES
-                        echo -n "-lmysqlclient " >> $srcdir/modules/pgmysqlbackend/OBJECTLIBS
-                fi 
-
-                if test x"$dopgsql" = xyes
-                then 
-                        echo -n "spgsql.o " >> $srcdir/modules/pgmysqlbackend/OBJECTFILES
-                        echo -n "-lpq++ -lpq -lssl -lcrypt -lcrypto " >> $srcdir/modules/pgmysqlbackend/OBJECTLIBS
-                fi 
-                ;;
-        esac
-
 
         for b in `cat $srcdir/modules/${a}backend/OBJECTFILES`

trunk/pdns/debian/rules

@@ -2 +2 @@
 
 tmpdir          := $(shell pwd)/debian/tmp
-backends        := mysql pipe xdb pgmysql
+backends        := mysql pipe xdb gmysql gpgsql
 
 configure:

trunk/pdns/modules/gpgsqlbackend/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libgpgsqlbackend.la
 
+EXTRA_DIST=OBJECTFILES OBJECTLIBS
 INCLUDES=-I@PGSQL_incdir@
 

trunk/pdns/modules/gpgsqlbackend/spgsql.cc

@@ -1 +1 @@
 /* Copyright 200w Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE 
    for more information.
-   $Id: spgsql.cc,v 1.1 2002/12/16 18:02:09 ahu Exp $  */
+   $Id: spgsql.cc,v 1.2 2002/12/17 10:39:53 ahu Exp $  */
+#include <string>
 #include "spgsql.hh"
-#include <string>
+
 #include <iostream>
 #include "pdns/logger.hh"

trunk/pdns/modules/xdbbackend/Makefile.in

@@ -13 +13 @@
 
 @SET_MAKE@
-
-#if !ALLSTATIC
-#install-exec-local:
-#       install .lib/libpipebackend.so.0.0.0 @libdir@
-#endif
 
 SHELL = @SHELL@
@@ -95 +90 @@
 modulelibs = @modulelibs@
 moduleobjects = @moduleobjects@
+programdescend = @programdescend@
 socketdir = @socketdir@
 
@@ -102 +98 @@
 lib_LTLIBRARIES = libxdbbackend.la
 
-libxdbbackend_la_SOURCES = xdbbackend.cc xdbbackend.hh xtdb.cc xtdb.hh
+libxdbbackend_la_SOURCES = xdbbackend.cc xtdb.cc xtdb.hh xdb.hh xgdbm.hh
 libxdbbackend_la_LDFLAGS = -module -ltdb
 

trunk/pdns/pdns/Makefile.am

@@ -30 +30 @@
 backends/bind/bindparser.cc backends/bind/bindlexer.c \
 backends/bind/huffman.cc backends/gsql/gsqlbackend.cc \
-backends/gsql/gsqlbackend.hh
+backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh 
 
 #