From 2ef98baeac8580a2ff22c99d7b037a77b23a6d5f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 12 Nov 2003 21:42:07 +0000
Subject: minor changes

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@41 07ea20a6-d2c5-0310-9e02-9ef735347d72
---
 Makefile.am  |  2 ++
 bootstrap.sh | 26 ++++++++++++++++----------
 configure.ac |  4 ----
 src/info.c   | 22 +++++++++++-----------
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7696cac..52441cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,3 +36,5 @@ homepage: all dist
 
 distcleancheck:
         @:
+
+.PHONY: homepage distcleancheck
diff --git a/bootstrap.sh b/bootstrap.sh
index e63defb..4cdd30f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# $Id: bootstrap.sh 3 2003-08-04 22:45:25Z lennart $
+#!/bin/bash
+# $Id$
 
 # This file is part of syrep.
 #
@@ -17,23 +17,29 @@
 # along with syrep; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+run_versioned() {
+    local P
+    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+
+    shift 2
+    "$P" "$@"
+}
+
 if [ "x$1" = "xam" ] ; then
     set -ex
-    automake -a -c
+    run_versioned automake 1.7 -a -c
     ./config.status
 else 
     set -ex
-
-    #make maintainer-clean || true
-
     rm -rf autom4te.cache
     rm -f config.cache
 
-    aclocal
+    run_versioned aclocal 1.7
     autoheader
-    automake -a -c
+    run_versioned automake 1.7 -a -c
     autoconf -Wall
 
-    ./configure "$@"
-fi
+    ./configure --sysconfdir=/etc "$@"
 
+    make clean
+fi
diff --git a/configure.ac b/configure.ac
index d95063b..0bc66de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,10 +54,6 @@ fi
 
 AM_CONDITIONAL([USE_SENDFILE], [test "x$sendfile" = xyes])
 
-# If using GCC specify some additional parameters
-if test "x$GCC" = "xyes" ; then
-   CFLAGS="$CFLAGS -pipe -Wall"
-fi
 
 AC_C_BIGENDIAN
 
diff --git a/src/info.c b/src/info.c
index f82473d..14446c2 100644
--- a/src/info.c
+++ b/src/info.c
@@ -26,24 +26,24 @@
 
 int info(struct syrep_db_context *c) {
     assert(c);
-    fprintf(stderr, "Origin: %s\n", c->origin);
-    fprintf(stderr, "Timestamp: %u\n", c->timestamp);
-    fprintf(stderr, "Version: %u\n", c->version);
-    fprintf(stderr, "Database nrecno_meta: ");
+    fprintf(stdout, "Origin: %s\n", c->origin);
+    fprintf(stdout, "Timestamp: %u; %s", c->timestamp, asctime(localtime(&c->timestamp)));
+    fprintf(stdout, "Version: %u\n", c->version);
+    fprintf(stdout, "Database nrecno_meta: ");
     statistics(c->db_id_meta);
-    fprintf(stderr, "Database md_nrecno: ");
+    fprintf(stdout, "Database md_nrecno: ");
     statistics(c->db_md_nrecno);
-    fprintf(stderr, "Database nrecno_md: ");
+    fprintf(stdout, "Database nrecno_md: ");
     statistics(c->db_nrecno_md);
-    fprintf(stderr, "Database nrecno_lastmd: ");
+    fprintf(stdout, "Database nrecno_lastmd: ");
     statistics(c->db_nrecno_lastmd);
-    fprintf(stderr, "Database md_lastnrecno: ");
+    fprintf(stdout, "Database md_lastnrecno: ");
     statistics(c->db_md_lastnrecno);
-    fprintf(stderr, "Database version_timestamp: ");
+    fprintf(stdout, "Database version_timestamp: ");
     statistics(c->db_version_timestamp);
-    fprintf(stderr, "Database nrecno_name: ");
+    fprintf(stdout, "Database nrecno_name: ");
     statistics(c->db_nrecno_name);
-    fprintf(stderr, "Database nhash_nrecno: ");
+    fprintf(stdout, "Database nhash_nrecno: ");
     statistics(c->db_nhash_nrecno);
     return 0;
 }
-- 
cgit