From eb1222e9e287dd8178f3382d9beb23008e99649e Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 16 Apr 2014 19:40:02 -0400
Subject: [PATCH] BOINCZIP: Another try.

---
 zip/configure.ac | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/zip/configure.ac b/zip/configure.ac
index ff839ebfec..e7d1f1ef31 100644
--- a/zip/configure.ac
+++ b/zip/configure.ac
@@ -1,44 +1,18 @@
 dnl -*- autoconf -*-
 
-dnl $Id$
-
-dnl not sure exactly what the minimum version is (but 2.13 wont work)
-AC_PREREQ(2.58)
-AC_INIT(BOINCZIP, 1.0.0)
+AC_INIT([boinczip], [1.0.0])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_TARGET
-
-dnl generate .tar.gz, .tar.bz2, .zip
-dnl AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
-AM_INIT_AUTOMAKE(dist-zip)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_CONFIG_SRCDIR(boinc_zip.cpp)
-
-dnl Checks for programs.
-AC_PROG_CC
+AC_CONFIG_SRCDIR([configure.ac])
 AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_MAKE_SET
-AM_PROG_CC_C_O
 
-dnl Heres another way to set up host-specific stuff
 AM_CONDITIONAL(OS_DARWIN, [echo $host_os | grep '^darwin' > /dev/null])
-if echo $host_os | grep '^darwin' >/dev/null ; then
-  if test `uname -r | sed 's/\.//g'` -lt 800 ; then
-    AC_DEFINE_UNQUOTED(DARWIN_10_3, [1],[Define to 1 if compiling under OS X 10.3 or earlier])
-  fi
-fi
-
 AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
 AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
 AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null])
 AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
 
-AC_CONFIG_FILES([
-                 Makefile
-		])
-
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT