diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-01 18:19:49 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-01 18:19:49 +0000 |
| commit | ebdf62cd13f7976890cbf3703571fc55a20df47e (patch) | |
| tree | 2ce7eea59f7ff5173e2c91f550d86b9cfe2f392a /misc | |
| parent | 8c04de48fdd50d279f1b7d93f184006ca1db056a (diff) | |
| download | xine-lib-ebdf62cd13f7976890cbf3703571fc55a20df47e.tar.gz xine-lib-ebdf62cd13f7976890cbf3703571fc55a20df47e.tar.bz2 | |
Improvements and implementing Michael's suggestions:
- new flags added at the end, so the users can override them properly
- removed X11 libs and cflags from xine-config and libxine.pc
- removed replacing for setenv (thanks to Robin for the hint)
- better way for temporary disabling of w32dll module
- data directories will be different on Windows
- force installing catalogs with translation into XINE_LOCALEDIR
- timer linked in xine-engine (just central place for linking such stuff)
- adjusted load_plugins and remove reduntant WIN32 conditionals
- removed unused $(lib_thr)
CVS patchset: 6927
CVS date: 2004/09/01 18:19:49
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 adef34f11..88d922b74 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_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @EXTRA_X_LIBS@ @LIBICONV@ -Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@ @EXTRA_X_CFLAGS@ +Libs: -L${libdir} -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ +Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@ diff --git a/misc/xine-config.in b/misc/xine-config.in index db6c7ec7e..90bcdc4c1 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_CFLAGS_CONFIG@ @EXTRA_X_CFLAGS@ + echo -I@includedir@ @THREAD_CFLAGS_CONFIG@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @EXTRA_X_LIBS@ @LIBICONV@ + echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" |