From 448be9fa3dcb50ff4b160a1b1566b20129731f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Sun, 11 Jun 2006 15:13:06 +0000
Subject: Add xine-specific changes to the new intl files, other little
 correction.

CVS patchset: 8034
CVS date: 2006/06/11 15:13:06
---
 m4/_xine.m4 |  2 +-
 m4/iconv.m4 | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'm4')

diff --git a/m4/_xine.m4 b/m4/_xine.m4
index a67425bdc..897ba07a2 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -180,7 +180,7 @@ dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
 dnl generate a default inttypes.h if the header file does not exist already
 AC_DEFUN([AC_CHECK_GENERATE_INTTYPES],
     [AC_CHECK_HEADER([inttypes.h],,
-        [[ ! -d $1 ] && mkdir $1
+        [if test ! -d $1; then mkdir $1; fi
         AC_CHECK_HEADER([stdint.h],
             [cat >$1/inttypes.h << EOF
 #ifndef _INTTYPES_H
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 654c41589..5ed7c43ae 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -15,6 +15,22 @@ AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
+
+  dnl
+  dnl xine: added the prefix /usr/local on FreeBSD if none specified
+  dnl
+  if test -z "$INCICONV"; then
+    case "$host" in
+      *-*-freebsd*)
+        dir=/usr/local
+        if test -d $dir/include; then INCICONV="$INCICONV -I$dir/include"; fi
+        if test -d $dir/lib; then
+          LIBICONV="$LIBICONV -L$dir/lib"
+          LTLIBICONV="$LTLIBICONV -L$dir/lib"
+        fi
+        ;;
+    esac
+  fi
 ])
 
 AC_DEFUN([AM_ICONV_LINK],
-- 
cgit v1.2.3