summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-08-04 23:56:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:14 -0500
commit6243e2a30414ef059fe2fd3636563269f4b12d06 (patch)
tree802e5f2a70321ae014a806dd4c61df9558c367cb
parenta0314b225fe0ebc8bd154f8117a0f97d3389befa (diff)
downloadsamba-6243e2a30414ef059fe2fd3636563269f4b12d06.tar.gz
samba-6243e2a30414ef059fe2fd3636563269f4b12d06.tar.bz2
samba-6243e2a30414ef059fe2fd3636563269f4b12d06.zip
r9078: - move charset stuff to lib/charset
- don't use the global $LIBS variable for -liconv as $LIBS is not used anymore should fix the build on solaris 10 metze (This used to be commit 69ade058fde8e4cc62e4830c0b080e720d8e581d)
-rw-r--r--source4/configure.in2
-rw-r--r--source4/lib/charset/charcnv.c (renamed from source4/lib/charcnv.c)0
-rw-r--r--source4/lib/charset/config.m4 (renamed from source4/lib/iconv.m4)21
-rw-r--r--source4/lib/charset/config.mk10
-rw-r--r--source4/lib/charset/iconv.c (renamed from source4/lib/iconv.c)0
-rw-r--r--source4/main.mk1
6 files changed, 22 insertions, 12 deletions
diff --git a/source4/configure.in b/source4/configure.in
index 9689c7c45d..1931b4fae8 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -16,7 +16,7 @@ sinclude(lib/replace/win32/config.m4)
sinclude(lib/replace/repdir/config.m4)
sinclude(heimdal_build/config.m4)
sinclude(lib/popt/config.m4)
-sinclude(lib/iconv.m4)
+sinclude(lib/charset/config.m4)
sinclude(lib/socket/config.m4)
sinclude(lib/netif/config.m4)
sinclude(lib/talloc/config.m4)
diff --git a/source4/lib/charcnv.c b/source4/lib/charset/charcnv.c
index e632790155..e632790155 100644
--- a/source4/lib/charcnv.c
+++ b/source4/lib/charset/charcnv.c
diff --git a/source4/lib/iconv.m4 b/source4/lib/charset/config.m4
index 282fa69b2d..9812c356ff 100644
--- a/source4/lib/iconv.m4
+++ b/source4/lib/charset/config.m4
@@ -26,19 +26,18 @@ for i in $LOOK_DIRS ; do
dnl Try to find iconv(3)
jm_ICONV($i)
+ TMP_ICONV_LIBS="$LIBS"
+
CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ export LDFLAGS LIBS CPPFLAGS
+
if test -n "$ICONV_FOUND" ; then
- LDFLAGS=$save_LDFLAGS
- LIB_ADD_DIR(LDFLAGS, "$i/lib")
- CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
- LIBS="$save_LIBS $LIBS"
- ICONV_LOCATION=$i
- export LDFLAGS LIBS CPPFLAGS
+ LIB_ADD_DIR(ICONV_LDFLAGS, $i/lib)
+ CFLAGS_ADD_DIR(ICONV_CPPFLAGS, $i/include)
+ ICONV_LIBS="$TMP_ICONV_LIBS"
break
- else
- LDFLAGS=$save_LDFLAGS
- LIBS=$save_LIBS
- export LDFLAGS LIBS CPPFLAGS
fi
done
@@ -63,4 +62,4 @@ if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; th
Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!])
fi
-SMB_SUBSYSTEM(CHARSET,lib/iconv.o,lib/charcnv.o,[${TMP_CHARSET_LIBS}])
+SMB_EXT_LIB(ICONV,[${ICONV_LIBS}],[${ICONV_CFLAGS}],[${ICONV_CPPFLAGS}],[${ICONV_LDFLAGS}])
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
new file mode 100644
index 0000000000..6b0fe02b72
--- /dev/null
+++ b/source4/lib/charset/config.mk
@@ -0,0 +1,10 @@
+################################################
+# Start SUBSYSTEM CHARSET
+[SUBSYSTEM::CHARSET]
+INIT_OBJ_FILES = \
+ lib/charset/iconv.o
+ADD_OBJ_FILES = \
+ lib/charset/charcnv.o
+REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
+# End SUBSYSTEM CHARSET
+################################################
diff --git a/source4/lib/iconv.c b/source4/lib/charset/iconv.c
index df590444e5..df590444e5 100644
--- a/source4/lib/iconv.c
+++ b/source4/lib/charset/iconv.c
diff --git a/source4/main.mk b/source4/main.mk
index 2e21e9d715..3054b05c06 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -10,6 +10,7 @@ include auth/config.mk
include nsswitch/config.mk
include lib/basic.mk
include lib/socket/config.mk
+include lib/charset/config.mk
include lib/ldb/config.mk
include lib/talloc/config.mk
include lib/tdb/config.mk