From 0475f97120b781ead9d6bec9c0d4f482c2b64000 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 19 Jul 2004 17:09:25 +0000
Subject: some build system updates and warning removals

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@61 07ea20a6-d2c5-0310-9e02-9ef735347d72
---
 bootstrap.sh  | 4 ++--
 configure.ac  | 2 +-
 src/md5util.c | 2 +-
 src/syrep.c   | 5 +++++
 src/util.c    | 6 +++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 4cdd30f..b3b326e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,7 +27,7 @@ run_versioned() {
 
 if [ "x$1" = "xam" ] ; then
     set -ex
-    run_versioned automake 1.7 -a -c
+    run_versioned automake 1.7 -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -39,7 +39,7 @@ else
     run_versioned automake 1.7 -a -c
     autoconf -Wall
 
-    ./configure --sysconfdir=/etc "$@"
+    CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
 
     make clean
 fi
diff --git a/configure.ac b/configure.ac
index 40b3a6e..9923cc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/syrep/])
 
 # If using GCC specifiy some additional parameters
 if test "x$GCC" = "xyes" ; then
-   CFLAGS="$CFLAGS -pipe -Wall -W"
+   CFLAGS="$CFLAGS -pipe -Wall -W -Wno-unused-parameter"
 fi
 
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
diff --git a/src/md5util.c b/src/md5util.c
index 27c6dd3..a6009e3 100644
--- a/src/md5util.c
+++ b/src/md5util.c
@@ -36,7 +36,7 @@
 #include "syrep.h"
 
 void fhex(const unsigned char *bin, int len, char *txt) {
-    const static char hex[] = "0123456789abcdef";
+    static const char hex[] = "0123456789abcdef";
     int i;
 
     for (i = 0; i < len; i++) {
diff --git a/src/syrep.c b/src/syrep.c
index 5ac60bd..3e4d69e 100644
--- a/src/syrep.c
+++ b/src/syrep.c
@@ -612,6 +612,11 @@ static int version(const char *argv0) {
             "Compiled with zlib %s, linked to zlib %s.\n"
             "Compiled with libdb %i.%i.%i, linked to libdb %i.%i.%i\n"
             "SVN Revision "SVN_REVISION"\n"
+#ifdef USE_XATTR
+            "Compile with extended attribute support: yes"
+#else
+            "Compile with extended attribute support: no"
+#endif
 #ifdef USE_SENDFILE
             "Using sendfile(): yes\n",
 #else
diff --git a/src/util.c b/src/util.c
index 2d010a0..cbb9b91 100644
--- a/src/util.c
+++ b/src/util.c
@@ -95,7 +95,7 @@ char* normalize_path(char *s) {
 
 void rotdash(void) {
     static const char dashes[] = /* ".oOo"; */ "|/-\\";
-    const static char *d = dashes;
+    static const char *d = dashes;
 
     if (!args.progress_flag)
         return;
@@ -328,7 +328,7 @@ int copy_fd(int sfd, int dfd, off_t l) {
             n = loop_read(sfd, dp+(dfo-mdfo), m);
             munmap(dp, dm);
 
-            if (n != m) {
+            if (n != (ssize_t) m) {
 
                 if (n < 0)
                     fprintf(stderr, "read(): %s\n", strerror(errno));
@@ -368,7 +368,7 @@ int copy_fd(int sfd, int dfd, off_t l) {
             n = loop_write(dfd, sp+(sfo-msfo), m);
             munmap(sp, sm);
 
-            if (n != m) {
+            if (n != (ssize_t) m) {
 
                 if (n < 0)
                     fprintf(stderr, "write(): %s\n", strerror(errno));
-- 
cgit