diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-06-17 12:39:42 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-06-17 12:39:42 +0200 |
| commit | 3c6685fcedf97e50e385e9febdb77b93f46c187a (patch) | |
| tree | af0cdbf3cce98de15ad26498184629cc4c19acf0 | |
| parent | 71c86fd9b7103008bce3bdd9ae011db08dd64c10 (diff) | |
| download | xine-lib-3c6685fcedf97e50e385e9febdb77b93f46c187a.tar.gz xine-lib-3c6685fcedf97e50e385e9febdb77b93f46c187a.tar.bz2 | |
Fix support for libtool 2.2.
- add AC_CONFIG_MACRO_DIR so that all the libtool macros are added to
the m4 directory rather than the toplevel one;
- check for libtool before checking for dlopen and other things;
- remove Fortran macro undefining hack, libtool 2.2 handle that properly.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2a3689fdc..78e473b84 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ dnl AC_INIT AC_CONFIG_SRCDIR([src/xine-engine/xine.c]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_LIBOBJ_DIR([lib]) dnl @@ -153,14 +154,10 @@ dnl --------------------------------------------- dnl Libtool dnl --------------------------------------------- -m4_undefine([AC_PROG_F77]) -m4_defun([AC_PROG_F77],[]) - +AC_PROG_LIBTOOL AC_LIBTOOL_DLOPEN AC_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL -AC_PROG_LIBTOOL_SANITYCHECK AC_SUBST(LIBTOOL_DEPS) if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then STATIC="-static" |