From b683f8137baa6d7d4ddb6db6fe4f7b2141abd071 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Wed, 23 May 2007 19:57:13 +0000
Subject: r23094: Update the iconv detection to handle cross-compiles better.
 If we are cross-compiling, we accept the first iconv library that we find
 (with a warning). (This used to be commit
 9417832155d634864f37d0fdb173ec607c154069)

---
 source3/m4/aclocal.m4 | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'source3/m4')

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index d36749a5f5..fd9efb60e6 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -420,22 +420,6 @@ main(){
   AC_MSG_RESULT($ICONV_CHARSET)
 ])
 
-dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
-dnl This function doesn't add -I/usr/include into CFLAGS
-AC_DEFUN(CFLAGS_ADD_DIR,[
-if test "$2" != "/usr/include" ; then
-    $1="$$1 -I$2"
-fi
-])
-
-dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
-dnl This function doesn't add -L/usr/lib into LDFLAGS
-AC_DEFUN(LIB_ADD_DIR,[
-if test "$2" != "/usr/lib" ; then
-    $1="$$1 -L$2"
-fi
-])
-
 dnl AC_ENABLE_SHARED - implement the --enable-shared flag
 dnl Usage: AC_ENABLE_SHARED[(DEFAULT)]
 dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-- 
cgit