diff options
| author | Robin KAY <komadori@users.sourceforge.net> | 2004-08-30 00:55:18 +0000 |
|---|---|---|
| committer | Robin KAY <komadori@users.sourceforge.net> | 2004-08-30 00:55:18 +0000 |
| commit | a5171860bcd55e56bacec9894c31c89d6b683494 (patch) | |
| tree | 6f94208cb9079acfeee961a2948cec88d1fc58d8 | |
| parent | 07be95eb3dc9d3a504df8d78a80c9136fbe2e866 (diff) | |
| download | xine-lib-a5171860bcd55e56bacec9894c31c89d6b683494.tar.gz xine-lib-a5171860bcd55e56bacec9894c31c89d6b683494.tar.bz2 | |
Fix the way the library path is supplied when testing for libdga. Disable compilation of win32/contrib/setenv.c on non-Win32 platforms (I don't see why it's necessary at all as we have xine_setenv). Front-ends use symbols in src/xine-utils but these aren't being exported in libxine.so because they come from an internal archive library. Compile xmlparser.c in src/xine-engine/Makefile.am for now (is there a better solution?).
CVS patchset: 6917
CVS date: 2004/08/30 00:55:18
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 6 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 1 | ||||
| -rw-r--r-- | win32/contrib/Makefile.am | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 1cd9acc52..cdec66471 100644 --- a/configure.ac +++ b/configure.ac @@ -644,6 +644,8 @@ dnl --------------------------------------------- dnl Check for Sun DGA dnl --------------------------------------------- +saved_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS -L/usr/openwin/lib" saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I/usr/openwin/include" AC_CHECK_LIB(dga, XDgaGrabDrawable, [ @@ -651,8 +653,9 @@ AC_CHECK_LIB(dga, XDgaGrabDrawable, [ SUNDGA_CFLAGS="-I/usr/openwin/include" SUNDGA_LIBS="-L/usr/openwin/lib -R/usr/openwin/lib -ldga" ac_have_sundga=yes - ], ) -], , "-L/usr/openwin/lib") + ]) +]) +LDFLAGS="$saved_LDFLAGS" CPPFLAGS="$saved_CPPFLAGS" AM_CONDITIONAL(HAVE_SUNDGA, [test x"$ac_have_sundga" = "xyes"]) AC_SUBST(SUNDGA_CFLAGS) diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 982a93c62..eb2d96a28 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -14,12 +14,12 @@ if !HAVE_ZLIB zlib_lib = $(INTERNAL_ZLIB_LIB) endif if WIN32 -dirent_lib = $(DIRENT_LIB) -pthread_lib = $(INTERNAL_PTHREAD_LIB) -endif if !HAVE_SETENV setenv_lib = $(SETENV_LIB) endif +dirent_lib = $(DIRENT_LIB) +pthread_lib = $(INTERNAL_PTHREAD_LIB) +endif libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ load_plugins.c video_decoder.c buffer_types.c \ diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index d2d9699ed..3fefad590 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -28,7 +28,6 @@ libxineutils_la_SOURCES = $(pppc_files) \ xine_check.c \ xine_mutex.c \ xmllexer.c \ - xmlparser.c \ xine_buffer.c libxineutils_la_DEPENDENCIES = $(TIMER_LIB) diff --git a/win32/contrib/Makefile.am b/win32/contrib/Makefile.am index 433ea66e6..135485199 100644 --- a/win32/contrib/Makefile.am +++ b/win32/contrib/Makefile.am @@ -4,11 +4,10 @@ SUBDIRS = zlib pthreads noinst_HEADERS = dirent/dirent.h timer/timer.h +if WIN32 if !HAVE_SETENV libsetenv = libsetenv.la endif - -if WIN32 win32libs = libtimer.la libdirent.la endif |