Restore builds --without-server

diff --git a/CHANGES b/CHANGES
index f8e7ae714f8efbbb5cbc3d25398e8412ce3d6e23..a8c090207c2143d3f1a8fe32646d644cea50a2b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+* Changes up to version 3.0.2
+
+Builds --without-server should work again.
+
 * Changes up to version 3.0.1
 
 Debian upgrades from 2.0.x should now work better.

diff --git a/configure.ac b/configure.ac
index 1d95de316a02a3008eaee4396a28384bf68a45b7..cd663d1d6b602391fdd726fcf46f9c27f60486f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -450,6 +450,8 @@ if test $want_server = yes; then
   fi
 fi
 
+AM_CONDITIONAL([SERVER], [test x$want_server = xyes])
+
 if test "x$GCC" = xyes; then
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
   AC_CACHE_CHECK([checking for GCC bug 29478],[rjk_cv_pr29478],[

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a7536d8820727aada9c5c9bb188bf1b4a14e4348..5402be3954d4bcd0d0c9deefce4272e833d1f462 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,6 +22,12 @@ noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 noinst_PROGRAMS=test
 
+if SERVER
+TRACKDB=trackdb.c
+else
+TRACKDB=trackdb-stub.c
+endif
+
 libdisorder_a_SOURCES=charset.c charset.h              \
        addr.c addr.h                                   \
        alsabg.c alsabg.h                               \
@@ -67,7 +73,7 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        types.h                                         \
        table.c table.h                                 \
        timeval.h                                       \
-       trackdb.h trackdb.c trackdb-int.h               \
+       $(TRACKDB) trackdb.h trackdb-int.h              \
        trackname.c trackname.h                         \
        url.h url.c                                     \
        user.h user.c                                   \
@@ -133,3 +139,5 @@ rebuild-unicode:
        mv $@.new $@
 
 CLEANFILES=definitions.h definitions.h.new
+
+EXTRA_DIST=trackdb.c trackdb-stub.c

diff --git a/lib/trackdb-stub.c b/lib/trackdb-stub.c
new file mode 100644 (file)
index 0000000..22174d3
--- /dev/null
+++ b/lib/trackdb-stub.c
@@ -0,0 +1,54 @@
+/*
+ * This file is part of DisOrder
+ * Copyright (C) 2008 Richard Kettlewell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+/** @file lib/trackdb-stub.c
+ * @brief Track database stubs
+ *
+ * Stubs for non-server builds
+ */
+
+#include <config.h>
+#include "types.h"
+
+#include <pcre.h>
+
+#include "rights.h"
+#include "trackdb.h"
+
+const char *trackdb_get_password(const char attribute((unused)) *user)  {
+  return NULL;
+}
+
+void trackdb_close(void) {
+}
+
+void trackdb_open(int attribute((unused)) flags) {
+}
+
+void trackdb_init(int attribute((unused)) flags) {
+}
+
+/*
+Local Variables:
+c-basic-offset:2
+comment-column:40
+fill-column:79
+indent-tabs-mode:nil
+End:
+*/