From 85aa1ccceb7169c51b917b0333a631775d028784 Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Thu, 7 Aug 2008 14:40:12 +0200
Subject: Bump autoconf requirement to 2.62 (latest released version).

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ab9eb45..4ce40e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.62)
 AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/pavucontrol.cc])
 AC_CONFIG_HEADERS([config.h])
-- 
cgit 


From 6f7e9419e480d068861a9dc4ff0c8d92c8621774 Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 8 Aug 2008 15:39:37 +0200
Subject: Create m4 directory, and set it up.

Make sure the m4 directory is known to autoconf.

Also ignore the macro files copied over by libtool, gettext and the
other tools.
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 4ce40e4..9cb5b11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@
 AC_PREREQ(2.62)
 AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/pavucontrol.cc])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
-- 
cgit 


From c6cc345552c504dbfe23837e80464fb094370aab Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 8 Aug 2008 15:57:50 +0200
Subject: Make use of common ZP_LYNX_DOC macro.

Instead of reproducing the same code on each configure.ac use the
common macro.
---
 configure.ac | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 9cb5b11..a5d0804 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,24 +60,7 @@ if test "x$GCC" = "xyes" ; then
    CXXFLAGS="$CXXFLAGS -pipe -Wall -W"
 fi
 
-# LYNX documentation generation
-AC_ARG_ENABLE(lynx,
-        AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation),
-[case "${enableval}" in
-  yes) lynx=yes ;;
-  no)  lynx=no ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;;
-esac],[lynx=yes])
-
-if test x$lynx = xyes ; then
-   AC_CHECK_PROG(have_lynx, lynx, yes, no)
-
-   if test x$have_lynx = xno ; then
-     AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***])
-   fi
-fi
-
-AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes])
+ZP_LYNX_DOC
 
 IT_PROG_INTLTOOL([0.35.0])
 GETTEXT_PACKAGE=pavucontrol
-- 
cgit