* doc/libtool.texi: fixed a typo

* libtoolize.in: add the libtool scripts to libltdl.tar.gz
* libtool.m4: don't AC_SUBST(USE_SYMBOL_UNDERSCORE),
  AC_CHECK_LIBM sets LIBM, AC_LIBLTDL_INSTALLABLE doesn't work
  when libltdl is already installed
* *demo/Makefile.am: use LIBM
* *demo/configure.in: AC_SUBST LIBM
* libltdl/configure.in: use ac_cv_sys_symbol_underscore instead of
  USE_SYMBOL_UNDERSCORE

diff --git a/ChangeLog b/ChangeLog
index 623e26b6243dbfbabc65a50ad12bd3cc9bcaa4c8..4f026d5911078cddb12e6c778d159b7547060cd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-03-30 Thomas Tanner  <tanner@gmx.de>
+
+       * doc/libtool.texi: fixed a typo
+       * libtoolize.in: add the libtool scripts to libltdl.tar.gz
+       * libtool.m4: don't AC_SUBST(USE_SYMBOL_UNDERSCORE),
+         AC_CHECK_LIBM sets LIBM, AC_LIBLTDL_INSTALLABLE doesn't work
+         when libltdl is already installed
+       * *demo/Makefile.am: use LIBM
+       * *demo/configure.in: AC_SUBST LIBM
+       * libltdl/configure.in: use ac_cv_sys_symbol_underscore instead of
+         USE_SYMBOL_UNDERSCORE
+
 1999-03-30  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltconfig.in (aix4*, collect2name): make sure collect2 exists

diff --git a/cdemo/Makefile.am b/cdemo/Makefile.am
index ab054957cdc331b20454ead41cd800899b6b490e..4f9d2930a9b9cfc2661ae727b2913f82a4a3cf6d 100644 (file)
--- a/cdemo/Makefile.am
+++ b/cdemo/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = acinclude.m4
 noinst_LTLIBRARIES = libfoo.la
 
 libfoo_la_SOURCES = foo.c
+libfoo_la_LIBADD = $(LIBM)
 
 noinst_HEADERS = foo.h
 

diff --git a/cdemo/configure.in b/cdemo/configure.in
index eea60fb90c21e48e62c31fef9956eddccaad15a1..cc1fed44483936903d1ac6be8e65437021962513 100644 (file)
--- a/cdemo/configure.in
+++ b/cdemo/configure.in
@@ -11,6 +11,7 @@ AC_SUBST(LIBTOOL_DEPS)
 AC_CHECK_HEADERS(math.h)
 
 AC_CHECK_LIBM
+AC_SUBST(LIBM)
 
 dnl Output the makefile
 AC_OUTPUT(Makefile)

diff --git a/demo/Makefile.am b/demo/Makefile.am
index f83e5c21339c6a753b2c57c57e8f28caf059a444..fcd17a9d2d383f9c1adc167a0a3a72a72c1bccd3 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -10,6 +10,7 @@ CLEANFILES = $(hardcode_tests)
 # Build a libtool library, libhello.la for installation in libdir.
 lib_LTLIBRARIES = libhello.la
 libhello_la_SOURCES = hello.c foo.c
+libhello_la_LIBADD = $(LIBM)
 libhello_la_LDFLAGS = -version-info 3:12:1
 
 include_HEADERS = foo.h
@@ -60,7 +61,7 @@ libhell1_la_LIBADD = -L. -lhell0 # libtool rejects libhell0.la
 libhell2_la_LIBADD = -L. -lhell0 # we have to use -L/-l.  Why?
 bin_PROGRAMS += hell0
 hell0_SOURCES = main.c
-hell0_LDADD = libhell1.la libhell2.la
+hell0_LDADD = libhell1.la libhell2.la $(LIBM)
 
 # Unfortunately, in order to test libtool thoroughly, we need access
 # to its private directory.
@@ -89,8 +90,8 @@ hc-direct: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
          eval `egrep -e '^(hardcode_.*|wl)=' libtool`; \
          libdir=$(libdir); \
          flag=`eval echo \"$$hardcode_libdir_flag_spec\"`; \
-         echo "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$shlib $(LIBS) $$flag || echo unsupported > $@"; \
-         eval "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$shlib $(LIBS) $$flag || echo unsupported > $@"
+         echo "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$shlib $(LIBS) $(LIBM) $$flag || echo unsupported > $@"; \
+         eval "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$shlib $(LIBS) $(LIBM) $$flag || echo unsupported > $@"
 
 hc-libflag: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
        @eval `egrep -e '^(hardcode_.*|wl)=' libtool`; \
@@ -100,8 +101,8 @@ hc-libflag: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
            echo "echo unsupported > $@"; \
            echo unsupported > $@ || status="$$?"; \
          else \
-           echo "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$flag -L$(libdir) -lhello $(LIBS)"; \
-           $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$flag -L$(libdir) -lhello $(LIBS) || status="$$?"; \
+           echo "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$flag -L$(libdir) -lhello $(LIBS) $(LIBM)"; \
+           $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) $$flag -L$(libdir) -lhello $(LIBS) $(LIBM) || status="$$?"; \
          fi; \
          exit $$status
 
@@ -111,16 +112,16 @@ hc-libpath: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
        @eval `egrep -e '^(shlibpath_var|hardcode_.*|wl)=' libtool`; \
          libdir=$(libdir); \
          flag=`eval echo \"$$hardcode_libdir_flag_spec\"`; \
-         echo "$$shlibpath_var=./$(objdir) $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello $(LIBS) $$flag || echo unsupported > $@"; \
-         eval "$$shlibpath_var=./$(objdir) $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello $(LIBS) $$flag || echo unsupported > $@"
+         echo "$$shlibpath_var=./$(objdir) $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello $(LIBS) $(LIBM) $$flag || echo unsupported > $@"; \
+         eval "$$shlibpath_var=./$(objdir) $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello $(LIBS) $(LIBM) $$flag || echo unsupported > $@"
 
 hc-minusL: $(hell_OBJECTS) $(hell_DEPENDENCIES)
        @rm -f hc-minusL
        @eval `egrep -e '^(hardcode_.*|wl)=' libtool`; \
          libdir=$(libdir); \
          flag=`eval echo \"$$hardcode_libdir_flag_spec\"`; \
-         echo "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -L./$(objdir) -lhello $(LIBS) $$flag || echo unsupported > $@"; \
-         eval "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -L./$(objdir) -lhello $(LIBS) $$flag || echo unsupported > $@"
+         echo "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -L./$(objdir) -lhello $(LIBS) $(LIBM) $$flag || echo unsupported > $@"; \
+         eval "$(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -L./$(objdir) -lhello $(LIBS) $(LIBM) $$flag || echo unsupported > $@"
 
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)

diff --git a/demo/configure.in b/demo/configure.in
index c419b56b601ec682b6b38dcf280262fa97b72a38..4257eca1bccc1df165a4cf8fb6e23c09720af4bb 100644 (file)
--- a/demo/configure.in
+++ b/demo/configure.in
@@ -23,6 +23,7 @@ grep '^global_symbol_pipe=..*$' ./libtool >/dev/null])
 AC_CHECK_HEADERS(string.h math.h)
 
 AC_CHECK_LIBM
+AC_SUBST(LIBM)
 
 dnl Output the makefile
 AC_OUTPUT(Makefile)

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 7d0d3cdedea7b9baf7bd4ed83cf1403bbab6de75..b94a12428fda3135ec1da049c2dbaf6b6e0aa7d4 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2592,7 +2592,7 @@ implementation of @file{libltdl} services, it requires GNU DLD, or it
 will only emulate dynamic linking with libtool's dlpreopening mechanism.
 
 @noindent
-libltdl supports currently the following dynamic linking mechanims:
+libltdl supports currently the following dynamic linking mechanisms:
 
 @itemize @bullet
 @item

diff --git a/libltdl/configure.in b/libltdl/configure.in
index 2a0bb859c39eaec9fbc67ff8a2393c8fad0254b3..ab775660901f9a2ce7ea046e2c9c8a982e92827b 100644 (file)
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -137,7 +137,7 @@ if test "$test_dlerror" = yes; then
 fi
 
 AC_SYS_SYMBOL_UNDERSCORE
-if test x"$USE_SYMBOL_UNDERSCORE" = xyes; then
+if test x"$ac_cv_sys_symbol_underscore" = xyes; then
   if test x"$ac_cv_func_dlopen" = xyes ||
      test x"$ac_cv_lib_dl_dlopen" = xyes ; then
        AC_CACHE_CHECK([whether we have to add an underscore for dlsym],

diff --git a/libtool.m4 b/libtool.m4
index 68ac6240359deafd4bc789604b942d1b95b1dfc3..0c5a993044f7d27506457a586d7804efb2e6c119 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -563,23 +563,22 @@ fi
 rm -rf conftest*
 ])
 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
-USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
-AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
 ])
 
 # AC_CHECK_LIBM - check for math library
 AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
 case "$host" in
 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl)
-  AC_CHECK_LIB(m, cos)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, cos)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
 ])
@@ -611,15 +610,20 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
 # appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
-  AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
-    case "$enable_ltdl_install" in
-    no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
-    "") enable_ltdl_install=yes
-        ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
-    esac
+  AC_CHECK_LIB(ltdl, main,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
   ])
-  if test x"$enable_ltdl_install" != x"no"; then
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
     LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
   fi
 ])
 

diff --git a/libtoolize.in b/libtoolize.in
index 342ba6988568b89e7e7a49859f9bb5dcab8160e5..6c9ad0b30f790942a5f4a41c142c0899944e3cc8 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -251,11 +251,31 @@ done
 
 if test "x$ltdl_tar" = x"yes"; then
   if test "x$dry_run" = x"yes"; then
-    echo "(cd $pkgdatadir > /dev/null && tar -cf - libltdl | gzip --best) > libltdl.tar.gz"
+    echo "tar -cf - libltdl | gzip --best > libltdl.tar.gz"
   elif test -f libltdl.tar.gz && test -z "$force"; then
     test -z "$automake" && echo "$progname: \`libltdl.tar.gz' exists: use \`--force' to overwrite" 1>&2
   else
-    (cd $pkgdatadir > /dev/null && tar -cf - libltdl | gzip --best) > libltdl.tar.gz
+    test -d libltdl && ${rm}r libltdl
+    $mkdir libltdl
+    ltdlfiles=`cd $pkgdatadir && ls libltdl/*`
+    for file in $ltdlfiles; do
+      if $cp $pkgdatadir/$file $file; then :
+      else
+       echo "$progname: cannot copy \`$pkgdatadir/$file' to \`$file'" 1>&2
+       status=1
+       break
+      fi
+    done
+    for file in $files; do
+      if $cp $pkgdatadir/$file libltdl/$file; then :
+      else
+       echo "$progname: cannot copy \`$pkgdatadir/$file' to \`libltdl/$file'" 1>&2
+       status=1
+       break
+      fi
+    done
+    tar -cf - libltdl | gzip --best > libltdl.tar.gz
+    ${rm}r libltdl
   fi
 fi
 

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index c6f5f48f42cd0431325eb5a7acb11c9fc0273981..56983e48cb899e3d74b866bccb69fb5fabb16940 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -9,9 +9,11 @@ EXTRA_DIST = acinclude.m4
 lib_LTLIBRARIES = foo1.la libfoo2.la
 
 foo1_la_SOURCES = foo1.c
+foo1_la_LIBADD = $(LIBM)
 foo1_la_LDFLAGS = -module -avoid-version
 
 libfoo2_la_SOURCES = foo2.c
+libfoo2_la_LIBADD = $(LIBM)
 libfoo2_la_LDFLAGS = -module
 
 noinst_HEADERS = foo.h

diff --git a/mdemo/configure.in b/mdemo/configure.in
index 495670dd57208a9108af327332f2149dabf9c3a0..cc46255e0e4f6a55a0ac0678ad67d98dc76b2a0c 100644 (file)
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -27,6 +27,7 @@ AC_SUBST(STATIC)
 AC_CHECK_HEADERS(math.h)
 
 AC_CHECK_LIBM
+AC_SUBST(LIBM)
 
 dnl Output the makefile
 AC_OUTPUT(Makefile)