Automaked pazpar2. Bug #799. Preprocessor defines are put in cconfig.h and

included in every C source. cconfig.h is the "configure" defines. The usualy
filename convention is config.h but that is already defined. For now all
contents of www and test is copied verbatim to the tar-dist. The contents is
not installed during 'make install'. That should be done, but since the
configuration is still in progress we don't bother yet. Similarly with
www: part of tar-dist but not yet installed. The only application
installed at this installed is pazpar2 - in PREFIX/bin.

diff --git a/.cvsignore b/.cvsignore
index e69de29..c433f6a 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+aclocal.m4
+ChangeLog
+autom4te.cache
+config.cache
+config.log
+config.status
+configure

diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..f0647d2
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,13 @@
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = src 
+
+EXTRA_DIST = README PROTOCOL m4/yaz.m4 
+
+dist-hook:
+       if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; fi
+       cp -r $(srcdir)/etc $(distdir)
+       cvs=`find $(distdir)/etc -name CVS -type d -print`; if test "$$cvs"; then rm -r $$cvs; fi
+       cp -r $(srcdir)/www $(distdir)
+       cvs=`find $(distdir)/www -name CVS -type d -print`; if test "$$cvs"; then rm -r $$cvs; fi

diff --git a/buildconf.sh b/buildconf.sh
new file mode 100755 (executable)
index 0000000..f718842
--- /dev/null
+++ b/buildconf.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+# $Id: buildconf.sh,v 1.1 2007-01-08 12:43:41 adam Exp $
+
+automake=automake
+aclocal=aclocal
+autoconf=autoconf
+libtoolize=libtoolize
+autoheader=autoheader
+
+if [ "`uname -s`" = FreeBSD ]; then
+    # FreeBSD intalls the various auto* tools with version numbers
+    echo "Using special configuration for FreeBSD ..."
+    automake=automake19
+    aclocal="aclocal19 -I /usr/local/share/aclocal"
+    autoconf=autoconf259
+    libtoolize=libtoolize15
+    autoheader=autoheader259
+fi
+if $automake --version|head -1 |grep '1\.[4-7]'; then
+    echo "automake 1.4-1.7 is active. You should use automake 1.8 or later"
+    if test -f /etc/debian_version; then
+       echo " sudo apt-get install automake1.9"
+       echo " sudo update-alternatives --config automake"
+    fi
+    exit 1
+fi
+
+set -x
+
+# I am tired of underquoted warnings for Tcl macros
+$aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
+$autoheader
+$automake --add-missing 
+$autoconf
+set -
+if [ -f config.cache ]; then
+    rm config.cache
+fi
+
+enable_configure=false
+enable_help=true
+sh_flags=""
+conf_flags=""
+case $1 in
+    -d)
+    sh_flags="-g -Wall"
+    enable_configure=true
+    enable_help=false
+    shift
+    ;;
+    -c)
+    sh_flags=""
+    enable_configure=true
+    enable_help=false
+    shift
+    ;;
+esac
+
+if $enable_configure; then
+    if test -n "$sh_flags"; then
+       CFLAGS="$sh_flags" ./configure $*
+    else
+       ./configure $*
+    fi
+fi
+if $enable_help; then
+    cat <<EOF
+    
+Build the Makefiles with the configure command.
+  ./configure [--someoption=somevalue ...]
+  
+For help on options or configuring run
+  ./configure --help
+
+Build and install binaries with the usual
+  make
+  make check
+  make install
+
+Build distribution tarball with
+  make dist
+
+Verify distribution tarball with
+  make distcheck
+
+Or just build the Debian packages without configuring
+  dpkg-buildpackage -rfakeroot
+
+When building from a CVS checkout, you need these Debian tools:
+  libyaz-dev
+
+EOF
+fi
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End:

diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..45b5f22
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,31 @@
+## -*- Autoconf -*-
+## Process this file with autoconf to produce a configure script.
+
+# Autoconf and automake setup
+AC_PREREQ(2.59)
+AC_INIT([pazpar2],[0.1],[pazpar2-help@indexdata.dk])
+
+AC_CONFIG_HEADERS(src/cconfig.h)
+
+AC_CONFIG_SRCDIR([configure.ac]) 
+AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE([1.8])
+
+AC_PROG_CC
+
+AC_LANG(C)
+
+YAZ_INIT(libxml2,2.1.44)
+if test -z "$YAZLIB"; then
+       AC_MSG_ERROR([YAZ development libraries missing])
+fi
+YAZ_DOC
+
+AC_CONFIG_FILES([
+       Makefile
+       src/Makefile
+])
+
+AC_OUTPUT

diff --git a/src/.cvsignore b/src/.cvsignore
index 8b5e62b..443b051 100644 (file)
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,3 +1,8 @@
 pazpar2
 Makefile
 yaz
+Makefile.in
+cconfig.h
+cconfig.h.in
+.deps
+stamp-h1

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644 (file)
index 0000000..c57c5ac
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,15 @@
+# ParaZ. Copyright (C) 2006-2007, Index Data.
+# $Id: Makefile.am,v 1.1 2007-01-08 12:43:41 adam Exp $
+
+bin_PROGRAMS = pazpar2
+
+MAINTAINERCLEANFILES = Makefile.in cconfig.h
+
+AM_CFLAGS = $(YAZINC)
+LDADD = $(YAZLIB)
+
+pazpar2_SOURCES = config.c config.h eventl.c eventl.h \
+       http.c http_command.c http_command.h http.h \
+       pazpar2.c pazpar2.h reclists.c reclists.h \
+       relevance.c relevance.h termlists.c termlists.h \
+       util.c util.h

diff --git a/src/Makefile.dist b/src/Makefile.dist
deleted file mode 100644 (file)
index c736ba2..0000000
--- a/src/Makefile.dist
+++ /dev/null
@@ -1,45 +0,0 @@
-# ParaZ. Copyright (C) 2000-2004, Index Data ApS
-# All rights reserved.
-# $Id: Makefile.dist,v 1.2 2007-01-06 04:54:58 quinn Exp $
-
-SHELL=/bin/sh
-
-CC=gcc
-
-YAZCONF=yaz-config
-YAZLIBS=`$(YAZCONF) --libs`
-YAZCFLAGS=`$(YAZCONF) --cflags`
-
-PROG=pazpar2
-PROGO=pazpar2.o eventl.o util.o http.o http_command.o termlists.o \
-               reclists.o relevance.o config.o
-
-all: $(PROG)
-
-$(PROG): $(PROGO)
-       $(CC) $(CFLAGS) $(YAZCFLAGS) -o $(PROG) $(PROGO) yaz/src/.libs/libyaz.a $(YAZLIBS)
-#      $(CC) $(CFLAGS) $(YAZCFLAGS) -o $(PROG) $(PROGO) $(YAZLIBS)
-
-.c.o:
-       $(CC) -c $(CFLAGS) -I. $(YAZCFLAGS) $<
-
-clean:
-       rm -f *.[oa] test core mon.out gmon.out errlist $(PROG)
-
-
-## Dependencies go below
-
-config.o: config.c config.h
-eventl.o: eventl.c eventl.h
-http.o: http.c util.h eventl.h pazpar2.h termlists.h relevance.h \
-  reclists.h config.h http.h http_command.h
-http_command.o: http_command.c util.h eventl.h pazpar2.h termlists.h \
-  relevance.h reclists.h config.h http.h http_command.h
-pazpar2.o: pazpar2.c pazpar2.h termlists.h relevance.h reclists.h \
-  eventl.h config.h http.h
-reclists.o: reclists.c pazpar2.h termlists.h relevance.h reclists.h \
-  eventl.h config.h
-relevance.o: relevance.c relevance.h pazpar2.h termlists.h eventl.h \
-  config.h reclists.h
-termlists.o: termlists.c termlists.h
-util.o: util.c

diff --git a/src/config.c b/src/config.c
index 3f02149..2c76882 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.3 2007-01-03 06:23:44 quinn Exp $ */
+/* $Id: config.c,v 1.4 2007-01-08 12:43:41 adam Exp $ */
 
 #include <string.h>
 
@@ -8,6 +8,10 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 #include <yaz/nmem.h>
 

diff --git a/src/eventl.c b/src/eventl.c
index 324dca1..89ffb12 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -6,12 +6,17 @@
  */
 
 /*
- * $Id: eventl.c,v 1.1 2006-12-20 20:47:16 quinn Exp $
+ * $Id: eventl.c,v 1.2 2007-01-08 12:43:41 adam Exp $
  * Based on revision YAZ' server/eventl.c 1.29.
  */
 
 #include <stdio.h>
 #include <assert.h>
+
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #ifdef WIN32
 #include <winsock.h>
 #else

diff --git a/src/http.c b/src/http.c
index db811b2..09d9f5c 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
 /*
- * $Id: http.c,v 1.5 2007-01-06 04:54:58 quinn Exp $
+ * $Id: http.c,v 1.6 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <stdio.h>
@@ -15,6 +15,10 @@
 #include <errno.h>
 #include <assert.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 #include <yaz/comstack.h>
 #include <netdb.h>

diff --git a/src/http_command.c b/src/http_command.c
index 086db07..4068cc8 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /*
- * $Id: http_command.c,v 1.8 2007-01-06 05:32:23 quinn Exp $
+ * $Id: http_command.c,v 1.9 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <stdio.h>
@@ -11,6 +11,10 @@
 #include <ctype.h>
 #include <sys/time.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 
 #include "util.h"

diff --git a/src/pazpar2.c b/src/pazpar2.c
index ea3af8a..18d0f0a 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.17 2007-01-06 04:54:58 quinn Exp $ */;
+/* $Id: pazpar2.c,v 1.18 2007-01-08 12:43:41 adam Exp $ */;
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -20,6 +20,10 @@
 #include <yaz/yaz-util.h>
 #include <yaz/nmem.h>
 
+#if HAVE_CONFIG_H
+#include "cconfig.h"
+#endif
+
 #define USE_TIMING 0
 #if USE_TIMING
 #include <yaz/timing.h>
@@ -33,7 +37,6 @@
 #include "relevance.h"
 #include "config.h"
 
-#define PAZPAR2_VERSION "0.1"
 #define MAX_CHUNK 15
 
 static void client_fatal(struct client *cl);
@@ -70,7 +73,7 @@ struct parameters global_parameters =
     30,
     "81",
     "Index Data PazPar2 (MasterKey)",
-    PAZPAR2_VERSION,
+    VERSION,
     600, // 10 minutes
     60,
     100,

diff --git a/src/reclists.c b/src/reclists.c
index 6bca856..b9ac9f1 100644 (file)
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,9 +1,13 @@
 /*
- * $Id: reclists.c,v 1.2 2007-01-05 20:33:05 adam Exp $
+ * $Id: reclists.c,v 1.3 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <assert.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 
 #include "pazpar2.h"

diff --git a/src/relevance.c b/src/relevance.c
index d689e7b..75800a2 100644 (file)
--- a/src/relevance.c
+++ b/src/relevance.c
@@ -1,11 +1,15 @@
 /*
- * $Id: relevance.c,v 1.3 2007-01-03 06:23:44 quinn Exp $
+ * $Id: relevance.c,v 1.4 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include "relevance.h"
 #include "pazpar2.h"
 

diff --git a/src/termlists.c b/src/termlists.c
index 7f32e3d..e586169 100644 (file)
--- a/src/termlists.c
+++ b/src/termlists.c
@@ -1,11 +1,15 @@
 /*
- * $Id: termlists.c,v 1.1 2006-12-20 20:47:16 quinn Exp $
+ * $Id: termlists.c,v 1.2 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <stdlib.h>
 #include <string.h>
 #include <yaz/yaz-util.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include "termlists.h"
 
 // Discussion:

diff --git a/src/util.c b/src/util.c
index a8547fa..8abcddc 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,6 +1,11 @@
-/* $Id: util.c,v 1.1 2006-12-20 20:47:16 quinn Exp $ */
+/* $Id: util.c,v 1.2 2007-01-08 12:43:41 adam Exp $ */
 
 #include <stdlib.h>
+
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 
 void die(char *string, char *add)