Skip to content
Snippets Groups Projects
Commit a91bd714 authored by Christian Engwer's avatar Christian Engwer
Browse files

Damn it! libtool is a pain in the ass!

make dune work with both... new and old libtool versions

[[Imported from SVN: r5129]]
parent 791380bb
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_PROG_CXXCPP])
AC_REQUIRE([AC_PROG_LIBTOOL])
AC_REQUIRE([LT_OUTPUT])
m4_ifdef([LT_OUTPUT],[LT_OUTPUT])
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_REQUIRE([DUNE_DISABLE_LIBCHECK])
......@@ -153,7 +153,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
HAVE_[]_DUNE_MODULE=0
# define LTCXXCOMPILE like it will be defined in the Makefile
LTCXXLINK="./libtool --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS"
LTCXXLINK="$srcdir/libtool --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS"
CXX="$LTCXXLINK"
# use module LDFLAGS
......
......@@ -31,16 +31,16 @@ m4_define([DUNE_AC_INIT],[
DUNE_PARSE_MODULE_FILE
AC_INIT(DUNE_MOD_NAME, DUNE_MOD_VERSION, DUNE_MAINTAINER_NAME)
# don't build shared libs per default, this is way better for debugging...
LT_INIT([disable-shared])
m4_ifdef([LT_INIT],
[LT_INIT],
[AC_DEFUN([LT_OUTPUT])])
AC_DISABLE_SHARED
])
AC_DEFUN([DUNE_CHECK_DEPENDENCIES], [
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
LT_LANG([C])
LT_LANG([C++])
AC_PROG_CXX
AC_PROG_LIBTOOL
AC_PROG_CXX
LT_OUTPUT
DUNE_PARSE_MODULE_FILE
DUNE_MODULE_DEPENDENCIES(DUNE_MOD_NAME)
......@@ -107,7 +107,6 @@ dnl check for library functions
# doxygen and latex take a lot of time...
AC_REQUIRE([DUNE_DOCUMENTATION])
# special variable to include the documentation into the website
AC_ARG_WITH(duneweb,
AC_HELP_STRING([--with-duneweb=PATH],[Only needed for website-generation, path to checked out version of dune-web]))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment