From 4a51e1cb9f59fd2313d9bd1c93e6be40348a4fc0 Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Thu, 7 Aug 2008 19:09:23 +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 25a86a89..f149864c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.62)
 
 m4_define(PA_MAJOR, [0])
 m4_define(PA_MINOR, [9])
-- 
cgit 


From f4e9b7d778c252f514b4b457305ba310394b4060 Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 8 Aug 2008 12:15:26 +0200
Subject: Remove gettext macros from configure.ac, intltool is used.

When using intltool there is no need to _also_ use gettext, so remove
gettext macros so that autoreconf does not copy them over.
---
 configure.ac | 2 --
 1 file changed, 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f149864c..66189077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,8 +440,6 @@ AC_CHECK_FUNCS([open64])
 
 AM_ICONV
 
-AM_GNU_GETTEXT([external])
-
 IT_PROG_INTLTOOL([0.35.0])
 GETTEXT_PACKAGE=pulseaudio
 AC_SUBST([GETTEXT_PACKAGE])
-- 
cgit 


From 2da79d5ade92c476326e3167d0a56986a9d96200 Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 8 Aug 2008 12:18:53 +0200
Subject: Create an m4 directory for common macros and use it.

Split acinclude.m4 in multiple macro files.

Let it be known to autoconf and aclocal to use the m4 directory.
Ignore macro files copied or linked by libtool and intltool.
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 66189077..4fa171f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ m4_define(PA_MICRO, [11])
 
 AC_INIT([pulseaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzchyfrnhqvb (at) 0pointer (dot) net])
 AC_CONFIG_SRCDIR([src/daemon/main.c])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.10 -Wall])
 
-- 
cgit 


From f8197cfc4c88a16933de036544f02f31ac26b78e Mon Sep 17 00:00:00 2001
From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 8 Aug 2008 12:24:57 +0200
Subject: Update code to use libtool 2.2. Use convenience recursive libltdl.

Also remove the code for older libtool from the daemon.
---
 configure.ac | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 4fa171f3..8bb3f8ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,29 +244,9 @@ else
 fi
 
 #### libtool stuff ####
-
-AC_LTDL_ENABLE_INSTALL
-AC_LIBLTDL_INSTALLABLE
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-AC_CONFIG_SUBDIRS(libltdl)
-
-old_LIBS=$LIBS
-LIBS="$LIBS $LIBLTDL"
-AC_CHECK_FUNCS([lt_dlmutex_register])
-LIBS=$old_LIBS
-AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
-
-if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
-    AC_MSG_ERROR([[
-
-        *** Cannot find the libltdl development files.
-        *** Maybe you need to install the libltdl-dev package.
-        ]])
-fi
+LT_CONFIG_LTDL_DIR([libltdl])
+LT_INIT([dlopen win32-dll])
+LTDL_INIT([convenience recursive])
 
 #### Determine build environment ####
 
@@ -1129,6 +1109,7 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"])
 
 AC_CONFIG_FILES([
 Makefile
+libltdl/Makefile
 src/Makefile
 man/Makefile
 libpulse.pc
-- 
cgit