summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-15 05:26:44 +0000
committerTim Potter <tpot@samba.org>2003-09-15 05:26:44 +0000
commit4d0d68191173aae351f12dc5805856980dcbfeb7 (patch)
tree00b48ba9d022e9c2a7b19fddc0a145f3e452d4f4
parentac4ae84d0848fde76887239b47a5deb5bbf76b21 (diff)
downloadsamba-4d0d68191173aae351f12dc5805856980dcbfeb7.tar.gz
samba-4d0d68191173aae351f12dc5805856980dcbfeb7.tar.bz2
samba-4d0d68191173aae351f12dc5805856980dcbfeb7.zip
Merge from Samba 3.0:
>Fix for typo in darwin detection. >Jeremy. >Fix for MacOS/X which uses STUPID BROKEN UNICODE COMPOSE CHARACTERS ! >(rant off :-). Inspired by work from Benjamin Riefenstahl <Benjamin.Riefenstahl@epost.de>. >Also add MacOSX/Darwin configure fixes. >Jerry - can we put this in 3.0 release ? :-). >Jeremy. (This used to be commit 7951dee600146623ce473659c3f41963ea873e3e)
-rw-r--r--source3/configure.in29
1 files changed, 28 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index a2e04b5d48..0cf34bc9a7 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -402,7 +402,6 @@ case "$host_os" in
*freebsd*)
AC_DEFINE(FREEBSD, 1, [Whether the host os is FreeBSD])
;;
-
#
# VOS may need to have POSIX support and System V compatibility enabled.
#
@@ -503,6 +502,26 @@ main() {
AC_MSG_RESULT([$LINUX_LFS_SUPPORT])
;;
+#
+# MacOS X is the *only* system that uses compose character in utf8. This
+# is so horribly broken....
+#
+ *darwin*)
+ AC_DEFINE(BROKEN_UNICODE_COMPOSE_CHARACTERS, 1, [Does this system use unicode compose characters])
+# Add Fink directories for various packages, like dlcompat.
+# Note: iconv does that explicitly below, but other packages
+# don't.
+ CPPFLAGS="$CPPFLAGS -I/sw/include"
+ LDFLAGS="$LDFLAGS -L/sw/lib"
+
+# If we have dlsym_prepend_underscore (from Fink's dlcompat),
+# use that instead of plain dlsym.
+
+ AC_CHECK_LIB(dl,dlopen)
+ AC_CHECK_FUNCS(dlsym_prepend_underscore,
+ [CPPFLAGS="$CPPFLAGS -Ddlsym=dlsym_prepend_underscore"])
+
+ ;;
*hurd*)
AC_MSG_CHECKING([for LFS support])
old_CPPFLAGS="$CPPFLAGS"
@@ -1162,6 +1181,14 @@ if test "$enable_shared" = "yes"; then
BLDSHARED="false"
LDSHFLAGS=""
;;
+
+ *darwin*) AC_DEFINE(DARWINOS,1,[Whether the host os is Darwin/MacOSX])
+ BLDSHARED="true"
+ LDSHFLAGS="-bundle -flat_namespace -undefined suppress"
+ SHLIBEXT="dylib"
+ AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+ ;;
+
*)
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
;;