diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-05-30 15:12:45 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-05-30 15:12:45 +0000 |
| commit | b962719e6154644032c999cfc293ee27cbdaa6c4 (patch) | |
| tree | 2aabdc1cc0d78aac20ea5881d0dc5f9fe177864b | |
| parent | 20ef0d453a69660f0515140e68e91a2cf4787f62 (diff) | |
| download | xine-lib-b962719e6154644032c999cfc293ee27cbdaa6c4.tar.gz xine-lib-b962719e6154644032c999cfc293ee27cbdaa6c4.tar.bz2 | |
Fix iconv on FreeBSD (i hope).
CVS patchset: 1968
CVS date: 2002/05/30 15:12:45
| -rw-r--r-- | configure.in | 28 | ||||
| -rw-r--r-- | src/libsputext/xine_decoder.c | 8 |
2 files changed, 17 insertions, 19 deletions
diff --git a/configure.in b/configure.in index f64405710..bb0ff9f01 100644 --- a/configure.in +++ b/configure.in @@ -314,19 +314,21 @@ case "$host_or_hostalias" in ;; i386-*-freebsd*) - AC_CHECK_FILE(/usr/local/include/iconv.h, - GICONV_BSD_LIBS="-lgiconv" - no_BSDiconv="no", - [ no_BSDiconv="yes" - echo - echo "****************************************************************" - echo "* You need to install a recent version of the port 'libiconv' *" - echo "* (in /usr/ports/converters/libiconv). *" - echo "* The library in this port is needed to successfully compile *" - echo "* libsputext plugin. *" - echo "****************************************************************" - echo - ],) + AC_CHECK_HEADER(/usr/local/include/iconv.h, + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/include" + GICONV_BSD_LIBS="-lgiconv" + no_BSDiconv="no", + [ no_BSDiconv="yes" + echo + echo "****************************************************************" + echo "* You need to install a recent version of the port 'libiconv' *" + echo "* (in /usr/ports/converters/libiconv). *" + echo "* The library in this port is needed to successfully compile *" + echo "* libsputext plugin. *" + echo "****************************************************************" + echo + ],) ;; ppc-*-linux* | powerpc-*) diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index 8c8f7ac7f..5ea13b503 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.25 2002/05/28 11:06:37 heikos Exp $ + * $Id: xine_decoder.c,v 1.26 2002/05/30 15:12:45 f1rmb Exp $ * * code based on mplayer module: * @@ -36,11 +36,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <ctype.h> -#ifdef __FreeBSD__ -# include </usr/local/include/iconv.h> -#else -# include <iconv.h> -#endif +#include <iconv.h> #include "buffer.h" #include "events.h" |