[Olena-patches] oln-0.10 10.240: Use Libtool

2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Use Libtool. * config/oln.m4 (AC_SHARED_LDFLAGS): Remove. * configure.ac: No longer use AC_SHARED_LDFLAGS. Use AC_PROG_LIBTOOL. Index: 10.239/configure.ac --- 10.239/configure.ac Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.8 600) +++ 10.240/configure.ac Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.9 600) @@ -23,6 +23,9 @@ AC_PROG_RANLIB AC_PROG_CC +# Use Libtool to build Swilena's dynamic modules. +AC_PROG_LIBTOOL + # If available, use these. AC_WITH_CXX_ZLIB AC_WITH_CXX_FFTW @@ -388,8 +391,6 @@ AC_CHECK_SWIG_FLAGS - AC_SHARED_LDFLAGS - AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) Index: 10.239/config/oln.m4 --- 10.239/config/oln.m4 Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/j/15_oln.m4 1.38.1.14 600) +++ 10.240/config/oln.m4 Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/j/15_oln.m4 1.38.1.15 600) @@ -650,54 +650,6 @@ AC_LANG_POP([C++]) ]) -# AC_SHARED_LDFLAGS - -# Queries the linker and set the required LDFLAGS for creating a -# shared library. - -# FIXME: This is a simple hack to have Swilena compile on our main -# targets (GNU/Linux/IA-32, Mac OS X/PowerPC). We should obviously -# use Libtool instead, as it handle a whole lot more -# linkers and parameters. - -AC_DEFUN([AC_SHARED_LDFLAGS], -[dnl - AC_CACHE_CHECK([for linker flags to create a shared library], - [ac_cv_ld_style], - [ac_cv_ld_style=unknown - # FIXME: We should not use a hard-coded name for the - # linker, but I can't find a means to get the (C++) linker - # from Autoconf. - if ld -v 2>&1 | grep -i "Apple Computer" >/dev/null 2>&1; - then - ac_cv_ld_style=Apple - elif ld -v 2>&1 | grep -i "GNU" >/dev/null 2>&1; then - ac_cv_ld_style=GNU - else - ac_cv_ld_style=other - fi]) - - case "$ac_cv_ld_style" in - GNU) - _SHARED_LDFLAGS="-shared" - ;; - Apple) - # Seen on http://www.penzilla.net/tutorials/python/swig/. - _SHARED_LDFLAGS="-bundle -flat_namespace -undefined suppress" - ;; - other) - # Default: assume we're using GNU ld. - _SHARED_LDFLAGS="-shared" - ;; - esac - - if test ! ${SHARED_LDFLAGS+set}; then - SHARED_LDFLAGS=$_SHARED_LDFLAGS - fi - - AC_SUBST([SHARED_LDFLAGS]) -]) - ### ### Internal stuff for Olena ###