diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-22 20:44:58 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-22 20:44:58 +0000 |
| commit | 62b1bb0c213c37b58e5a7bb8359f41168c34f817 (patch) | |
| tree | f1de97d131b2fa1bf0a75ab75c1f6d329df7555d /misc | |
| parent | 17a17afd5835c29cc8da396771278f2ead31e8fe (diff) | |
| download | xine-lib-62b1bb0c213c37b58e5a7bb8359f41168c34f817.tar.gz xine-lib-62b1bb0c213c37b58e5a7bb8359f41168c34f817.tar.bz2 | |
Fix crosscompile to use build and host definition from autoconf, rather than using hacksaround. Also replace the whole pthread check with an improved macro originally written for XCB, this way it's not going to try linking the fake -lpthread on Darwin, and it also does not force a -I/usr/local/include on FreeBSD. The new macro respects the same variables set by ports, so that it's even more transparent to FreeBSD users.
CVS patchset: 8739
CVS date: 2007/03/22 20:44:58
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libxine.pc.in | 4 | ||||
| -rw-r--r-- | misc/xine-config.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index ea21d74a3..032eedfc1 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -7,5 +7,5 @@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ Requires: -Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ -Cflags: -I${includedir} @THREAD_CPPFLAGS@ +Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ +Cflags: -I${includedir} @PTHREAD_CFLAGS@ diff --git a/misc/xine-config.in b/misc/xine-config.in index e21bed104..8d288b22b 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -100,11 +100,11 @@ if test "$echo_acflags" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@ @THREAD_CPPFLAGS@ + echo -I@includedir@ @PTHREAD_CFLAGS@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ + echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" |