X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=349b82b08a08d322ef2ace2fab9292f8d9d5d675;hb=8ebec49d9ddb5c5d69b5a5e383f20125e416180e;hp=f33d501642669273076d81c1ae9a5c486735567d;hpb=8aba5c5059645e657016eee3d3d68e1c67b99b13;p=openldap

diff --git a/configure.in b/configure.in
index f33d501642..349b82b08a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,11 @@
-dnl Copyright 1998 The OpenLDAP Foundation.  All Rights Reserved.
+dnl
+dnl Copyright 1998,1999 The OpenLDAP Foundation.  All Rights Reserved.
 dnl 
 dnl Redistribution and use in source and binary forms are permitted only
 dnl as authorized by the OpenLDAP Public License.  A copy of this
 dnl license is available at http://www.OpenLDAP.org/license.html or
 dnl in file LICENSE in the top-level directory of the distribution.
-dnl ----
+dnl
 
 dnl Configure.in for OpenLDAP
 AC_INIT(include/ldap.h)dnl
@@ -39,9 +40,9 @@ AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for in
 AC_SUBST(ldap_subdir)dnl
 
 OL_ARG_ENABLE(debug,[  --enable-debug 	enable debugging], yes)dnl
+ol_enable_syslog=no
 dnl OL_ARG_ENABLE(syslog,[  --enable-syslog	enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl
-OL_ARG_ENABLE(libui,[  --enable-libui	enable library user interface], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache	enable caching], yes)dnl
 OL_ARG_ENABLE(dns,[  --enable-dns		enable V2 DNS  extension], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals	enable V2 Referrals extension], yes)dnl
@@ -49,7 +50,10 @@ OL_ARG_ENABLE(cldap,[  --enable-cldap	enable connectionless ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	enable cross compiling],
 	no, [yes no])dnl
 
+
 dnl General "with" options
+OL_ARG_ENABLE(dmalloc,[  --enable-dmalloc	enable debug malloc support], no)dnl
+
 OL_ARG_WITH(kerberos,[  --with-kerberos	use Kerberos],
 	auto, [auto k5 k4 afs yes no])
 OL_ARG_WITH(threads,[  --with-threads	use threads],
@@ -494,6 +498,37 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
 			LIBS="$save_LIBS"
 		fi
 
+		dnl HP-UX 11 check
+		if test $ol_link_threads = no; then
+			save_LIBS="$LIBS"
+			LIBS="$LIBS -lpthread"
+			AC_MSG_CHECKING([for pthread_create() in HP-UX -lpthread])
+			ol_try_pthread_hpux_11=no
+			AC_CACHE_VAL(ol_cv_pthread_hpux_11,[
+				AC_TRY_LINK([
+#include <pthread.h>
+#include <elf.h>
+#ifndef ELFABI_HPUX_REL11
+	die horribly
+#endif
+				], [pthread_create(NULL, NULL, NULL, NULL);],
+					ol_try_pthread_hpux_11=yes
+					ol_cv_pthread_hpux_11=yes,
+					ol_cv_pthread_hpux_11=no)])
+			AC_MSG_RESULT(yes)
+			LIBS="$save_LIBS"
+
+			if test $ol_cv_pthread_hpux_11=yes ; then
+				ol_link_threads=posix
+				LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"
+				if test $ol_try_pthread_hpux_11=yes ; then
+					dnl Some tests below may fail, cause we aint including
+					dnl pthread.h. Force appropriate ones to yes
+					ac_cv_func_pthread_attr_init=yes
+				fi
+			fi
+		fi
+
 		if test $ol_link_threads != no ; then
 			AC_DEFINE(HAVE_PTHREADS)
 
@@ -967,7 +1002,7 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
 	ol_enable_ldbm=no
 fi
 
-if test $ol_enable_wrappers = yes ; then
+if test $ol_enable_wrappers != no ; then
 	AC_CHECK_LIB(wrap, main,
 		[have_wrappers=yes], [have_wrappers=no])
 
@@ -986,6 +1021,19 @@ if test $ol_enable_wrappers = yes ; then
 
 fi
 
+if test $ol_enable_syslog != no ; then
+	AC_CHECK_FUNC(openlog)
+	if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then
+		AC_MSG_ERROR(could not find syslog, select appropriate options or disable)
+	fi
+	ol_enable_syslog=$ac_cv_func_openlog
+fi
+
+if test $ol_enable_dmalloc != no ; then
+	AC_CHECK_HEADERS(dmalloc.h)
+	AC_CHECK_LIB(dmalloc, dmalloc_shutdown)
+fi
+
 # ud needs termcap (should insert check here)
 ol_link_termcap=no
 AC_CHECK_HEADERS(termcap.h ncurses.h)
@@ -1102,6 +1150,7 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AM_TYPE_PTRDIFF_T
 AC_TYPE_SIGNAL
+OL_TYPE_SIG_ATOMIC_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
@@ -1109,6 +1158,7 @@ AC_STRUCT_TM
 
 OL_C_UPPER_LOWER
 AC_C_CONST
+OL_C_VOLATILE
 
 if test $cross_compiling = yes ; then
 	AC_DEFINE(CROSS_COMPILING, 1)
@@ -1129,7 +1179,7 @@ AC_FUNC_VPRINTF
 
 if test $ac_cv_func_vprintf = yes ; then
 	dnl check for vsnprintf
-	AC_CHECK_FUNCS(vsnprintf)
+	AC_CHECK_FUNCS(vsnprintf vsprintf)
 fi
 
 AC_FUNC_WAIT3
@@ -1196,71 +1246,71 @@ OL_SYS_ERRLIST
 dnl ----------------------------------------------------------------
 dnl Sort out defines
 
-if test $ol_enable_debug != no ; then
+if test "$ol_enable_debug" != no ; then
 	AC_DEFINE(LDAP_DEBUG,1)
 fi
-dnl	if test $ol_enable_syslog != no ; then
-dnl		AC_DEFINE(LDAP_SYSLOG,1)
-dnl	fi
-if test $ol_enable_libui = yes ; then
+if test "$ol_enable_syslog" = yes ; then
+	AC_DEFINE(LDAP_SYSLOG,1)
+fi
+if test "$ol_enable_libui" = yes ; then
 	AC_DEFINE(LDAP_LIBUI,1)
 fi
-if test $ol_enable_cache = no ; then
+if test "$ol_enable_cache" = no ; then
 	AC_DEFINE(LDAP_NOCACHE,1)
 fi
-if test $ol_enable_dns != no ; then
+if test "$ol_enable_dns" != no ; then
 	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION,1)
 fi
-if test $ol_enable_proctitle != no ; then
+if test "$ol_enable_proctitle" != no ; then
 	AC_DEFINE(LDAP_PROCTITLE,1)
 fi
-if test $ol_enable_referrals != no ; then
+if test "$ol_enable_referrals" != no ; then
 	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION,1)
 fi
-if test $ol_enable_cldap != no ; then
+if test "$ol_enable_cldap" != no ; then
 	AC_DEFINE(LDAP_CONNECTIONLESS,1)
 fi
 
-if test $ol_enable_aclgroups != no ; then
+if test "$ol_enable_aclgroups" != no ; then
 	AC_DEFINE(SLAPD_ACLGROUPS,1)
 fi
-if test $ol_enable_crypt != no ; then
+if test "$ol_enable_crypt" != no ; then
 	AC_DEFINE(SLAPD_CRYPT,1)
 fi
-if test $ol_enable_cleartext != no ; then
+if test "$ol_enable_cleartext" != no ; then
 	AC_DEFINE(SLAPD_CLEARTEXT,1)
 fi
-if test $ol_enable_phonetic != no ; then
+if test "$ol_enable_phonetic" != no ; then
 	AC_DEFINE(SLAPD_PHONETIC,1)
 fi
-if test $ol_enable_rlookups != no ; then
+if test "$ol_enable_rlookups" != no ; then
 	AC_DEFINE(SLAPD_RLOOKUPS,1)
 fi
 
-if test $ol_link_ldbm != no ; then
+if test "$ol_link_ldbm" != no ; then
 	AC_DEFINE(SLAPD_LDBM,1)
 	BUILD_SLAPD=yes
 	BUILD_LDBM=yes
 fi
 
-if test $ol_enable_passwd != no ; then
+if test "$ol_enable_passwd" != no ; then
 	AC_DEFINE(SLAPD_PASSWD,1)
 	BUILD_SLAPD=yes
 	BUILD_PASSWD=yes
 fi
 
-if test $ol_enable_shell != no ; then
+if test "$ol_enable_shell" != no ; then
 	AC_DEFINE(SLAPD_SHELL,1)
 	BUILD_SLAPD=yes
 	BUILD_SHELL=yes
 fi
 
-if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \
+if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
 	$BUILD_SLAPD = yes ; then
 	BUILD_SLURPD=yes
 fi
 
-if test $ol_link_isode != no ; then
+if test "$ol_link_isode" != no ; then
 	BUILD_LDAPD=yes
 fi