From a3e566c4d3631076e29f3651554603184b6351a7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Sun, 17 May 2009 01:34:10 +0200
Subject: Gnulib durch boost ersetzt

---
 aclocal.m4 | 55 ++-----------------------------------------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

(limited to 'aclocal.m4')

diff --git a/aclocal.m4 b/aclocal.m4
index 5cefb1e..73bc5c1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -623,41 +623,6 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
@@ -941,30 +906,14 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/00gnulib.m4])
 m4_include([m4/argz.m4])
+m4_include([m4/ax_boost_base.m4])
+m4_include([m4/ax_boost_thread.m4])
 m4_include([m4/ax_lib_mysql.m4])
-m4_include([m4/base64.m4])
-m4_include([m4/cond.m4])
-m4_include([m4/errno_h.m4])
-m4_include([m4/extensions.m4])
-m4_include([m4/gettimeofday.m4])
-m4_include([m4/gnulib-common.m4])
-m4_include([m4/gnulib-comp.m4])
-m4_include([m4/include_next.m4])
-m4_include([m4/lib-ld.m4])
-m4_include([m4/lib-link.m4])
-m4_include([m4/lib-prefix.m4])
 m4_include([m4/libtool.m4])
-m4_include([m4/lock.m4])
 m4_include([m4/ltdl.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
 m4_include([m4/pkg.m4])
-m4_include([m4/stdbool.m4])
-m4_include([m4/sys_time_h.m4])
-m4_include([m4/thread.m4])
-m4_include([m4/threadlib.m4])
-m4_include([m4/time_h.m4])
-- 
cgit v1.2.3