Move eu_ZIPLIB macro to m4/zip.am, new file.

diff --git a/ChangeLog b/ChangeLog
index a03fc75718284b29af59554edd71c2e9dce961fa..7433b2181899863e43be7004d692df00ab9e3cd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  Roland McGrath  <roland@redhat.com>
+
+       * configure.ac (eu_ZIPLIB): Moved to m4/zip.am.
+
 2009-01-05  Roland McGrath  <roland@redhat.com>
 
        * configure.ac (eu_ZIPLIB): New macro.

diff --git a/configure.ac b/configure.ac
index dac33924adf59d35b575cdc5ab4004f50206a708..6a3b6a7f0888c137237ea1230082b8e1bfbfff6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -182,21 +182,8 @@ AC_SUBST([LIBEBL_SUBDIR])
 AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
 AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
 
-m4_defun([eu_ZIPLIB], [with_[$1]lib=default
-AC_ARG_WITH([[$1]lib],
-AC_HELP_STRING([--with-[$1]lib], [support g[$1]ip compression in libdwfl]))
-if test $with_[$1]lib != no; then
-  AC_SEARCH_LIBS([$4], [$3], [with_[$1]lib=yes],
-                [test $with_[$1]lib = default ||
-                 AC_MSG_ERROR([missing -l[$3] for --with-[$1]lib])])
-fi
-AM_CONDITIONAL([$2]LIB, test $with_[$1]lib = yes)
-if test $with_[$1]lib = yes; then
-  AC_DEFINE(USE_[$2]LIB)
-fi
-AH_TEMPLATE(USE_[$2]LIB, [Support $5 decompression via -l$3.])
-])
-
+dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
 save_LIBS="$LIBS"
 LIBS=
 eu_ZIPLIB(z,Z,z,gzdopen,gzip)

diff --git a/m4/ChangeLog b/m4/ChangeLog
index e285a0e4367925dda02969fce5140f20649f3be9..eea78ff0330c81450450adaf8dc036e7189bc0a7 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-08  Roland McGrath  <roland@redhat.com>
+
+       * zip.am: New file.
+       * Makefile.am (EXTRA_DIST): Add it.
+
 2007-06-05  Ulrich Drepper  <drepper@redhat.com>
 
        * gettext.m4: Update from gettext 0.16.1.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index dd955e68698d69d4872e6bc75a2bbc0128549f66..156010c72c366703d1913c102670feb7836fe1e5 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ##
-## Copyright (C) 2000, 2001, 2002, 2004, 2005 Red Hat, Inc.
+## Copyright (C) 2000-2009 Red Hat, Inc.
 ## This file is part of Red Hat elfutils.
 ##
 ## Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -26,4 +26,4 @@
 ##
 
 ##m4-files-begin
-EXTRA_DIST = codeset.m4 gettext.m4 iconv.m4 lcmessage.m4 progtest.m4
+EXTRA_DIST = codeset.m4 gettext.m4 iconv.m4 lcmessage.m4 progtest.m4 zip.m4

diff --git a/m4/zip.m4 b/m4/zip.m4
new file mode 100644 (file)
index 0000000..398d1be
--- /dev/null
+++ b/m4/zip.m4
@@ -0,0 +1,17 @@
+dnl Test for either zlib or bzlib.
+dnl Defines --with-$1lib argument, $2LIB automake conditional,
+dnl and sets AC_DEFINE(USE_$2LIB) and LIBS.
+
+AC_DEFUN([eu_ZIPLIB], [with_[$1]lib=default
+AC_ARG_WITH([[$1]lib],
+AC_HELP_STRING([--with-[$1]lib], [support g[$1]ip compression in libdwfl]))
+if test $with_[$1]lib != no; then
+  AC_SEARCH_LIBS([$4], [$3], [with_[$1]lib=yes],
+                [test $with_[$1]lib = default ||
+                 AC_MSG_ERROR([missing -l[$3] for --with-[$1]lib])])
+fi
+AM_CONDITIONAL([$2]LIB, test $with_[$1]lib = yes)
+if test $with_[$1]lib = yes; then
+  AC_DEFINE(USE_[$2]LIB)
+fi
+AH_TEMPLATE(USE_[$2]LIB, [Support $5 decompression via -l$3.])])