* ltmain.in: Add -pthread and similar to $deplibs ($compile_deplibs

and $finalize_deplibs for programs) when found on the command line
or in a .la file's dependency_libs (but don't place them there) so
they are honoured when linking both programs and libraries.

diff --git a/ChangeLog b/ChangeLog
index d19f93acd19af51261360406cb4b8404b996e203..6c33ac5ab2c1824ecc3a09f321945b7b08acc1a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-23  Scott James Remnant  <scott@netsplit.com>
+
+       * ltmain.in: Add -pthread and similar to $deplibs ($compile_deplibs
+       and $finalize_deplibs for programs) when found on the command line
+       or in a .la file's dependency_libs (but don't place them there) so
+       they are honoured when linking both programs and libraries.
+
 2004-01-23  Scott James Remnant  <scott@netsplit.com>
 
        * ltmain.in: In compile mode, delay parsing of -shared, -static,

diff --git a/ltmain.in b/ltmain.in
index d3e5090cc82dc4f70599a1c763d461cbf0ab7901..462eb67991ef5f0b8348b8b770f5a46ab1b75588 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1343,6 +1343,11 @@ EOF
        continue
        ;;
 
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+       deplibs="$deplibs $arg"
+       continue
+       ;;
+
       -module)
        module=yes
        continue
@@ -1822,6 +1827,15 @@ EOF
        lib=
        found=no
        case $deplib in
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           deplibs="$deplib $deplibs"
+         fi
+         continue
+         ;;
        -l*)
          if test "$linkmode" != lib && test "$linkmode" != prog; then
            $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2