From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 16 Dec 2008 12:55:06 +0000 (+0100)
Subject: Merge commit 'flameeyes/libtool-2.2'
X-Git-Tag: v0.9.15-test1~296
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ee9276d97f15ea965fb8a88f2aa184355b9903a;p=platform%2Fupstream%2Fpulseaudio.git

Merge commit 'flameeyes/libtool-2.2'
---

2ee9276d97f15ea965fb8a88f2aa184355b9903a
diff --cc configure.ac
index c5930c0,8bb3f8a..95ac9c2
--- a/configure.ac
+++ b/configure.ac
@@@ -194,44 -219,34 +194,24 @@@ els
      esac
  fi
  
 -AC_MSG_CHECKING([whether $CC knows __thread])
 -AC_LANG_CONFTEST([static __thread int a = 6; int main() { a = 5; }])
 -$CC conftest.c $CFLAGS -o conftest > /dev/null 2> /dev/null
 -ret=$?
 -rm -f conftest.o conftest
 -if test $ret -eq 0 ; then
 -    AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
 -    AC_MSG_RESULT([yes])
 -else
 -    AC_MSG_RESULT([no])
 -fi
 +CC_CHECK_TLS
 +
 +AC_CACHE_CHECK([whether $CC knows _Bool],
 +  pulseaudio_cv__Bool,
 +  [AC_COMPILE_IFELSE(
 +     AC_LANG_PROGRAM([], [[_Bool b;]]),
 +     [pulseaudio_cv__Bool=yes],
 +     [pulseaudio_cv__Bool=no])
 +  ])
  
 -AC_MSG_CHECKING([whether $CC knows _Bool])
 -AC_LANG_CONFTEST([int main() { _Bool b; }])
 -$CC conftest.c $CFLAGS -o conftest > /dev/null 2> /dev/null
 -ret=$?
 -rm -f conftest.o conftest
 -if test $ret -eq 0 ; then
 +AS_IF([test "$pulseaudio_cv__Bool" = "yes"], [
      AC_DEFINE([HAVE_STD_BOOL], 1, [Have _Bool.])
 -    AC_MSG_RESULT([yes])
 -else
 -    AC_MSG_RESULT([no])
 -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 ####