summaryrefslogtreecommitdiff
path: root/lib/util/charset
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-31 02:17:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-10-31 02:01:44 +0000
commit3deece559159150a0710d8160f39583ba7f2e582 (patch)
tree861600d7060d1ca8764c26f7ecc2cb82a4a44bec /lib/util/charset
parent9401189d5435632bcc6a177845ce03beaa804113 (diff)
downloadsamba-3deece559159150a0710d8160f39583ba7f2e582.tar.gz
samba-3deece559159150a0710d8160f39583ba7f2e582.tar.bz2
samba-3deece559159150a0710d8160f39583ba7f2e582.zip
s4: Remove the old perl/m4/make/mk-based build system.
The new waf-based build system now has all the same functionality, and the old build system has been broken for quite some time. Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104
Diffstat (limited to 'lib/util/charset')
-rw-r--r--lib/util/charset/config.m486
-rw-r--r--lib/util/charset/config.mk11
2 files changed, 0 insertions, 97 deletions
diff --git a/lib/util/charset/config.m4 b/lib/util/charset/config.m4
deleted file mode 100644
index 453de9fe26..0000000000
--- a/lib/util/charset/config.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-dnl SMB_CHECK_ICONV(hdr, msg, action-if-found,action-if-not-found)
-AC_DEFUN(SMB_CHECK_ICONV,[
- AC_MSG_CHECKING($2)
- AC_TRY_RUN([#include <stdlib.h>
-#include <$1>
-
-int main()
-{
- iconv_t cd = iconv_open("ASCII","UCS-2LE");
- if (cd == 0 || cd == (iconv_t)-1) return -1;
- return 0;
-}
- ],
- [AC_MSG_RESULT(yes); $3],
- [AC_MSG_RESULT(no); $4],
- [AC_MSG_RESULT(cross); $4])
-])
-
-dnl SMB_CHECK_ICONV_DIR(dir,action-if-found,action-if-not-found)
-AC_DEFUN(SMB_CHECK_ICONV_DIR,
-[
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CPPFLAGS="-I$1/include"
- LDFLAGS="-L$1/lib"
- LIBS=-liconv
-
- SMB_CHECK_ICONV(iconv.h,Whether iconv.h is present,[ AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) $2 ], [
- LIBS=-lgiconv
- SMB_CHECK_ICONV(giconv.h,Whether giconv.h is present, [AC_DEFINE(HAVE_GICONV_H,1,[Whether giconv.h is present]) $2],[$3])
- ])
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
-])
-
-ICONV_FOUND=no
-LOOK_DIRS="/usr /usr/local /sw"
-AC_ARG_WITH(libiconv,
-[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
-[
- if test "$withval" = "no" ; then
- AC_MSG_ERROR(I won't take no for an answer)
- else
- if test "$withval" != "yes" ; then
- SMB_CHECK_ICONV_DIR($withval, [
- ICONV_FOUND=yes;
- ICONV_CPPFLAGS="$CPPFLAGS"
- ICONV_LIBS="$LIBS"
- ICONV_LDFLAGS="$LDFLAGS"
- ], [AC_MSG_ERROR([No iconv library found in $withval])])
- fi
- fi
-])
-
-if test x$ICONV_FOUND = xno; then
- SMB_CHECK_ICONV(iconv.h,
- [Whether iconv.h is present],
- [AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) ICONV_FOUND=yes])
-fi
-
-for i in $LOOK_DIRS ; do
- if test x$ICONV_FOUND = xyes; then
- break
- fi
-
- SMB_CHECK_ICONV_DIR($i, [
- ICONV_FOUND=yes
- ICONV_CPPFLAGS="$CPPFLAGS"
- ICONV_LIBS="$LIBS"
- ICONV_LDFLAGS="$LDFLAGS"
- ], [])
-done
-
-if test x"$ICONV_FOUND" = x"no"; then
- AC_MSG_WARN([Sufficient support for iconv function was not found.
- Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!])
- SMB_ENABLE(ICONV,NO)
-else
- AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether external iconv is available])
- SMB_ENABLE(ICONV,YES)
-fi
-
-SMB_EXT_LIB(ICONV,[${ICONV_LIBS}],[${ICONV_CFLAGS}],[${ICONV_CPPFLAGS}],[${ICONV_LDFLAGS}])
diff --git a/lib/util/charset/config.mk b/lib/util/charset/config.mk
deleted file mode 100644
index 952c13a84d..0000000000
--- a/lib/util/charset/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################
-# Start SUBSYSTEM CHARSET
-[SUBSYSTEM::CHARSET]
-PUBLIC_DEPENDENCIES = ICONV
-PRIVATE_DEPENDENCIES = DYNCONFIG
-# End SUBSYSTEM CHARSET
-################################################
-
-CHARSET_OBJ_FILES = $(addprefix $(libcharsetsrcdir)/, iconv.o charcnv.o util_unistr.o codepoints.o)
-
-PUBLIC_HEADERS += $(libcharsetsrcdir)/charset.h