[pulseaudio-commits] configure.ac src/daemon

[Tanu Kaskinen]

 configure.ac             |    9 ++-------
 src/daemon/dumpmodules.c |    4 ----
 2 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 2219a775c4271a2c1c80da0fc539a630d63c1e04
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Tue Jul 10 14:44:03 2012 +0200

    daemon: Fix redundant redeclaration warning
    
      CC     pulseaudio-dumpmodules.o
    daemon/dumpmodules.c:93:27: warning: redundant redeclaration of ‘lt__PROGRAM__LTX_preloaded_symbols’ [-Wredundant-decls]
    /usr/include/ltdl.h:106:36: note: previous declaration of ‘lt__PROGRAM__LTX_preloaded_symbols’ was here
    
    the declaration is provided by ltld.h of libtool since version 2.4, require the 2.4 instead of 2.2
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/configure.ac b/configure.ac
index 546fcb0..2154429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,14 +320,9 @@ esac
 
 #### libtool stuff ####
 
-LT_PREREQ(2.2)
+LT_PREREQ(2.4)
 LT_INIT([dlopen win32-dll disable-static])
 
-dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
-dnl exactly which version of libltdl is present in the system, so we
-dnl just assume that it's a working version as long as we have the
-dnl library and the header files.
-dnl
 dnl As an extra safety device, check for lt_dladvise_init() which is
 dnl only implemented in libtool 2.x, and refine as we go if we have
 dnl refined requirements.
@@ -345,7 +340,7 @@ AC_CHECK_HEADER([ltdl.h],
     [LIBLTDL=])
 
 AS_IF([test "x$LIBLTDL" = "x"],
-    [AC_MSG_ERROR([Unable to find libltdl version 2. Makes sure you have libtool 2.2 or later installed.])])
+    [AC_MSG_ERROR([Unable to find libltdl version 2. Makes sure you have libtool 2.4 or later installed.])])
 AC_SUBST([LIBLTDL])
 
 
diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index 6f45e12..0529e04 100644
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -89,10 +89,6 @@ static void show_info(const char *name, const char *path, void (*info)(const cha
     }
 }
 
-#ifndef OS_IS_WIN32
-extern const lt_dlsymlist lt_preloaded_symbols[];
-#endif
-
 static int is_preloaded(const char *name) {
     const lt_dlsymlist *l;