[xiph-cvs] cvs commit: vorbis-tools/ogg123 Makefile.am

[Stan Seibert]

volsung     01/12/17 18:38:11

  Modified:    .        Tag: volsung_kc_20011011 acinclude.m4
               ogg123   Tag: volsung_kc_20011011 Makefile.am
  Log:
  More pthread detection fixes.  I think this works now.  Tested on Solaris
  OpenBSD and Linux.

Revision  Changes    Path
No                   revision

No                   revision

1.9.4.4   +1 -2      vorbis-tools/acinclude.m4

Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/acinclude.m4,v
retrieving revision 1.9.4.3
retrieving revision 1.9.4.4
diff -u -r1.9.4.3 -r1.9.4.4
--- acinclude.m4	2001/12/17 17:28:32	1.9.4.3
+++ acinclude.m4	2001/12/18 02:38:06	1.9.4.4
@@ -581,8 +581,7 @@
         # a function called by this macro, so we could check for that, but
         # who knows whether they'll stub that too in a future libc.)  So,
         # we'll just look for -pthreads and -lpthread first:
-
-        acx_pthread_flags="pthread -pthread -pthreads -mt $acx_pthread_flags"
+        acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
         ;;
 esac
 

No                   revision

No                   revision

1.14.2.4.2.9 +2 -1      vorbis-tools/ogg123/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.14.2.4.2.8
retrieving revision 1.14.2.4.2.9
diff -u -r1.14.2.4.2.8 -r1.14.2.4.2.9
--- Makefile.am	2001/12/17 17:28:33	1.14.2.4.2.8
+++ Makefile.am	2001/12/18 02:38:09	1.14.2.4.2.9
@@ -12,7 +12,8 @@
            @PTHREAD_CFLAGS@ @SHARE_CFLAGS@
 
 ogg123_LDADD = @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
-               @SOCKET_LIBS@ @SHARE_LIBS@ @CURL_LIBS@ @PTHREAD_LIBS@
+               @SOCKET_LIBS@ @SHARE_LIBS@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
+               @PTHREAD_LIBS@
 ogg123_DEPENDENCIES = @SHARE_LIBS@
 ogg123_SOURCES = audio.c buffer.c callbacks.c \
                  cfgfile_options.c cmdline_options.c \

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.