diff options
| author | James Peach <jpeach@samba.org> | 2007-05-23 19:57:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:45 -0500 |
| commit | b683f8137baa6d7d4ddb6db6fe4f7b2141abd071 (patch) | |
| tree | 2e4f4e0d4e8447bc72bc67ca0eb9665b1a507c25 /source3/m4 | |
| parent | af720295fdf7576e19d0def6f352aedd184a3744 (diff) | |
| download | samba-b683f8137baa6d7d4ddb6db6fe4f7b2141abd071.tar.gz samba-b683f8137baa6d7d4ddb6db6fe4f7b2141abd071.tar.bz2 samba-b683f8137baa6d7d4ddb6db6fe4f7b2141abd071.zip | |
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)
Diffstat (limited to 'source3/m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 16 |
1 files changed, 0 insertions, 16 deletions
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 |