diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
| commit | 21272e4f1caa9d0b3fe81f68929e8bbba125a977 (patch) | |
| tree | 34e6b88093d79653a2bdd60a9a127a18cfda2f1d /configure.ac | |
| parent | a657c3df2f453941b115de0ece3ad8d849d58a6b (diff) | |
| download | xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.gz xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.bz2 | |
Various compilation fixes and updates:
- xine compilable without iconv (scream if I something broke)
- update MSVC port, fixes in avi demux
- add iff.h into makefiles
- ffmpeg depends on zlib (build was OK only when freetype was installed)
- commit a patch for goom
CVS patchset: 6192
CVS date: 2004/02/29 17:26:45
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 923411e88..32d15e2e8 100644 --- a/configure.ac +++ b/configure.ac @@ -479,10 +479,8 @@ case "$host_or_hostalias" in AC_CHECK_HEADER(/usr/local/include/iconv.h, CFLAGS="-I/usr/local/include $CFLAGS" LDFLAGS="-L/usr/local/lib $LDFLAGS" - GICONV_BSD_LIBS="-liconv" - no_BSDiconv="no", - [ no_BSDiconv="yes" - echo + LIBICONV="-liconv" + [ echo echo "****************************************************************" echo "* You need to install a recent version of the port 'libiconv' *" echo "* (in /usr/ports/converters/libiconv). *" @@ -498,11 +496,8 @@ case "$host_or_hostalias" in ;; *) - no_BSDiconv="no" ;; esac -AC_SUBST(GICONV_BSD_LIBS) -AM_CONDITIONAL(HAVE_GICONV, test x$no_BSDiconv != "xyes") AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes") |