]> git.sur5r.net Git - openldap/blobdiff - configure.in
VC++ update... tools now link!
[openldap] / configure.in
index dc50682c2dffcbd530ef689e27b8abbcd23f47b8..0b5967cc633bf1130c403116936054c092df1481 100644 (file)
@@ -28,7 +28,7 @@ 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 dns support], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals  enable referrals], yes)dnl
-OL_ARG_ENABLE(cldap,[  --enable-clapd  enable connectionless ldap], no)dnl
+OL_ARG_ENABLE(cldap,[  --enable-cldap  enable connectionless ldap], no)dnl
 
 dnl General "with" options
 OL_ARG_WITH(kerberos,[  --with-kerberos        use Kerberos],
@@ -164,20 +164,13 @@ fi
 AC_MSG_RESULT(done)
 
 ## Initialize vars
-LDAP_DEFS=
 LDAP_LIBS=
-LDBM_DEFS=
 LDBM_LIBS=
-LTHREAD_DEFS=
 LTHREAD_LIBS=
-LUTIL_DEFS=
 LUTIL_LIBS=
 
-LDAPD_DEFS=
 LDAPD_LIBS=
-SLAPD_DEFS=
 SLAPD_LIBS=
-SLURPD_DEFS=
 SLURPD_LIBS=
 
 BUILD_LDAPD=no
@@ -188,17 +181,12 @@ BUILD_LDBM=no
 BUILD_PASSWD=no
 BUILD_SHELL=no
 
-KRB_DEFS=
 KRB_LIBS=
-TERMCAP_DEFS=
 TERMCAP_LIBS=
 
 dnl ----------------------------------------------------------------
 dnl Checks for programs
 
-AC_PROG_CC
-AC_PROG_GCC_TRADITIONAL
-
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_PROG_RANLIB
@@ -209,6 +197,14 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
 AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
 AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
 
+dnl Checks the compiler and UNIX Variants
+AC_PROG_CC
+AC_PROG_GCC_TRADITIONAL
+
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
+
 dnl ----------------------------------------------------------------
 dnl Checks for libraries
 
@@ -245,7 +241,6 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
 
                        AC_DEFINE(HAVE_KERBEROS)
 
-                       KRB_DEFS="-DKERBEROS"
                        KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
                fi
        fi
@@ -262,7 +257,6 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
 
                        AC_DEFINE(HAVE_KERBEROS)
 
-                       KRB_DEFS="-DKERBEROS"
                        KRB_LIBS="-lkrb -ldes"
                fi
        fi
@@ -277,10 +271,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
                OL_POSIX_THREAD_VERSION
 
                if test $ol_cv_pthread_version = final ; then
-                       LTHREAD_DEFS="$LTHREAD_DEFS -DPOSIX_THREADS"
+                       dnl AC_DEFINE(HAVE_PTHREADS_FINAL)
                elif test $ol_cv_pthread_version = draft4 ; then
                        AC_DEFINE(HAVE_PTHREADS_D4)
-                       LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_MIT_PTHREADS"
                else
                        AC_MSG_ERROR([unknown pthread version])
                fi
@@ -292,7 +285,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
 
                if test $ol_cv_linux_threads = yes ; then
                        AC_DEFINE(HAVE_LINUX_THREADS,1)
-                       LTHREAD_DEFS="$LTHREAD_DEFS -DLINUX_THREADS"
                fi
 
                dnl Now the hard part, how to link
@@ -345,7 +337,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
                        AC_CHECK_LIB(pthread, pthread_create, [
                                AC_DEFINE(HAVE_DCE)
                                ol_link_threads=posix
-                               LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_DCE_THREADS"
                                LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"],,
                                if test $with_preemptive = auto ; then
                                        ol_with_preemptive=yes
@@ -360,7 +351,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
                        dnl save DEFS/LIBS
                        save_CPPFLAGS="$CPPFLAGS"
                        save_LIBS="$LIBS"
-                       CPPFLAGS="$LTHREAD_DEFS $CPPFLAGS"
                        LIBS="$LTHREAD_LIBS $LIBS"
 
                        dnl All POSIX Thread (final) implementations should have
@@ -456,8 +446,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = cthreads ; then
                AC_CHECK_LIB(lwp, cthread_fork, [have_cthreads=yes], [have_cthreads=no])
 
                if test $have_cthreads = yes ; then
-                       AC_DEFINE(HAVE_CTHREADS)
-                       LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_NEXT_CTHREADS"
+                       AC_DEFINE(HAVE_MACH_CTHREADS)
                        LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
                fi
        fi
@@ -472,7 +461,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then
                if test $have_lwp = yes ; then
                        AC_DEFINE(HAVE_LWP)
                        AC_DEFINE(HAVE_LWP_THR)
-                       LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS5_LWP"
                        LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
                fi
        fi
@@ -484,7 +472,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then
 
                if test $have_lwp = yes ; then
                        AC_DEFINE(HAVE_LWP)
-                       LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS4_LWP"
                        LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
 
                        if test $with_preemptive = auto ; then
@@ -495,7 +482,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then
 fi
 
 if test $ol_with_preemptive = yes ; then
-       LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_PREEMPTIVE"
+       AC_DEFINE(THREAD_PREEMPTIVE,1)
 fi
 
 if test $ol_with_threads = manual ; then
@@ -523,7 +510,7 @@ if test $ol_link_threads = no ; then
                $ol_with_threads = no
        fi
 
-       LTHREAD_DEFS="-DNO_THREADS"
+       AC_DEFINE(NO_THREADS,1)
        LTHREAD_LIBS=""
 fi
 
@@ -535,12 +522,10 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then
                ol_link_ldbm=db2
                ol_with_ldbm_api=db2
 
-               LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2"
-
                if test $ol_with_ldbm_type = hash ; then
-                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH"
+                       AC_DEFINE(LDBM_USE_DBHASH,1)
                else
-                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE"
+                       AC_DEFINE(LDBM_USE_DBBTREE,1)
                fi
 
                dnl $ol_cv_lib_db2 should be yes or -ldb
@@ -558,14 +543,10 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then
                ol_link_ldbm=db
                ol_with_ldbm_api=db
 
-               if test $ac_cv_header_db_185_h = yes ; then
-                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2_COMPAT185"
-               fi
-
                if test $ol_with_ldbm_type = hash ; then
-                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH"
+                       AC_DEFINE(LDBM_USE_DBHASH,1)
                else
-                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE"
+                       AC_DEFINE(LDBM_USE_DBBTREE,1)
                fi
 
                dnl $ol_cv_lib_db should be yes or -ldb
@@ -597,8 +578,6 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
                ol_link_ldbm=gdbm
                ol_with_ldbm_api=gdbm
 
-               LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_GDBM"
-
                if test $ol_cv_lib_gdbm != yes ; then
                        LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm"
                fi
@@ -616,8 +595,6 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
                        AC_WARN([Attempting to use NDBM.  Functionality will be limited.])
                fi
 
-               LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_NDBM"
-
                if test $ol_cv_lib_ndbm != yes ; then
                        LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"
                fi
@@ -639,8 +616,7 @@ if test $ol_enable_wrappers = yes ; then
                [have_wrappers=yes], [have_wrappers=no])
 
        if test $have_wrappers = yes ; then
-dnl            AC_DEFINE(HAVE_TCPD)
-               SLAPD_DEFS="$SLAPD_DEFS -DTCP_WRAPPERS"
+               AC_DEFINE(HAVE_TCPD)
                SLAPD_LIBS="$SLAPD_LIBS -lwrap"
        else
                AC_MSG_WARN(could not find -lwrap)
@@ -656,13 +632,12 @@ fi
 
 # ud needs termcap (should insert check here)
 ol_link_termcap=no
-
 AC_CHECK_HEADERS(termcap.h ncurses.h)
 
 if test $ol_link_termcap = no ; then
        AC_CHECK_LIB(termcap, tputs, [have_termcap=yes], [have_termcap=no])
        if test $have_termcap = yes ; then
-dnl            AC_DEFINE(HAVE_TERMCAP)
+               AC_DEFINE(HAVE_TERMCAP)
                ol_link_termcap=yes
                TERMCAP_LIBS=-ltermcap
        fi
@@ -671,14 +646,14 @@ fi
 if test $ol_link_termcap = no ; then
        AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
        if test $have_ncurses = yes ; then
-dnl            AC_DEFINE(HAVE_NCURSES)
+               AC_DEFINE(HAVE_NCURSES)
                ol_link_termcap=yes
                TERMCAP_LIBS=-lncurses
        fi
 fi
 
 if test $ol_link_termcap = no ; then
-       TERMCAP_DEFS="-DNOTERMCAP"
+       AC_DEFINE(NO_TERMCAP,1)
        TERMCAP_LIBS=
 fi
 
@@ -689,8 +664,7 @@ if test $ol_enable_crypt != no ; then
                        have_crypt=yes], [have_crypt=no])])
 
        if test $have_crypt = yes ; then
-dnl            AC_DEFINE(HAVE_CRYPT)
-               LUTIL_DEFS="$LUTIL_DEFS -DLDAP_CRYPT"
+               AC_DEFINE(HAVE_CRYPT)
        else
                AC_MSG_WARN(could not find crypt)
                if test $ol_enable_crypt = yes ; then
@@ -709,16 +683,23 @@ AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS( \
        stddef.h        \
+       errno.h         \
        fcntl.h         \
        filio.h         \
+       getopt.h        \
        limits.h        \
        malloc.h        \
+       regex.h         \
        sgtty.h         \
        sys/file.h      \
+       sys/errno.h \
        sys/ioctl.h     \
+       sys/param.h     \
+       sys/socket.h\
        sys/time.h      \
+       sys/types.h     \
        syslog.h        \
-       termio.h        \
+       termios.h       \
        unistd.h        \
 )
 
@@ -735,9 +716,13 @@ AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-dnl AC_C_BIGENDIAN
+AC_C_BIGENDIAN
 AC_C_CONST
 
+dnl AC_CHECK_SIZEOF(short) 
+dnl AC_CHECK_SIZEOF(int) 
+dnl AC_CHECK_SIZEOF(long)
+
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
@@ -746,12 +731,15 @@ AC_FUNC_VPRINTF
 AC_FUNC_WAIT3
 
 AC_CHECK_FUNCS(                \
+       bcopy                   \
+       getopt                  \
        flock                   \
        gethostname             \
        gettimeofday    \
        getdtablesize   \
        lockf                   \
        memcpy                  \
+       memmove                 \
        mktime                  \
        select                  \
        setpwfile               \
@@ -769,7 +757,7 @@ AC_CHECK_FUNCS(             \
        sysconf                 \
 )
 
-AC_REPLACE_FUNCS(strdup)
+AC_REPLACE_FUNCS(getopt strdup)
 
 dnl ----------------------------------------------------------------
 # Check Configuration
@@ -779,71 +767,67 @@ dnl ----------------------------------------------------------------
 dnl Sort out defines
 
 if test $ol_enable_debug != no ; then
-       LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG"
+       AC_DEFINE(LDAP_DEBUG,1)
 fi
 dnl    if test $ol_enable_syslog != no ; then
-dnl            LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG"
+dnl            AC_DEFINE(LDAP_SYSLOG,1)
 dnl    fi
 if test $ol_enable_libui = yes ; then
-       LDAP_DEFS="$LDAP_DEFS -DLDAP_LIBUI"
+       AC_DEFINE(LDAP_LIBUI,1)
 fi
 if test $ol_enable_cache = no ; then
-       LDAP_DEFS="$LDAP_DEFS -DNO_CACHE"
+       AC_DEFINE(LDAP_NOCACHE,1)
 fi
 if test $ol_enable_dns != no ; then
-       LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS"
+       AC_DEFINE(LDAP_DNS,1)
 fi
 if test $ol_enable_referrals != no ; then
-       LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS"
+       AC_DEFINE(LDAP_REFERRALS,1)
 fi
 if test $ol_enable_cldap != no ; then
-       LDAP_DEFS="$LDAP_DEFS -DCLDAP"
+       AC_DEFINE(LDAP_CONNECTIONLESS,1)
 fi
 
 if test $ol_enable_aclgroup != no ; then
        AC_DEFINE(SLAPD_ACLGROUP,1)
-       SLAPD_DEFS="$SLAPD_DEFS -DACLGROUP"
+fi
+
+if test $ol_enable_crypt != no ; then
+       AC_DEFINE(SLAPD_CRYPT,1)
 fi
 
 if test $ol_enable_md5 != no ; then
-dnl    AC_DEFINE(SLAPD_MD5,1)
-       LUTIL_DEFS="$LUTIL_DEFS -DLDAP_MD5"
+       AC_DEFINE(SLAPD_MD5,1)
 fi
 
 if test $ol_enable_sha1 != no ; then
-dnl    AC_DEFINE(SLAPD_SHA1,1)
-       LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1"
+       AC_DEFINE(SLAPD_SHA1,1)
 fi
 
 if test $ol_enable_phonetic != no ; then
        AC_DEFINE(SLAPD_PHONETIC,1)
-       SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX"
 fi
 
 if test $ol_enable_rlookups != no ; then
        AC_DEFINE(SLAPD_RLOOKUPS,1)
-       SLAPD_DEFS="$SLAPD_DEFS -DREVERSE_LOOKUPS"
 fi
 
 if test $ol_link_ldbm != no ; then
-dnl    AC_DEFINE(SLAPD_LDBM,1)
+       AC_DEFINE(SLAPD_LDBM,1)
        BUILD_SLAPD=yes
        BUILD_LDBM=yes
-       LDBM_DEFS="-DLDAP_LDBM $LDBM_DEFS"
 fi
 
 if test $ol_enable_passwd != no ; then
-dnl    AC_DEFINE(SLAPD_PASSWD,1)
+       AC_DEFINE(SLAPD_PASSWD,1)
        BUILD_SLAPD=yes
        BUILD_PASSWD=yes
-       SLAPD_DEFS="-DLDAP_PASSWD $SLAPD_DEFS"
 fi
 
 if test $ol_enable_shell != no ; then
-dnl    AC_DEFINE(SLAPD_SHELL,1)
+       AC_DEFINE(SLAPD_SHELL,1)
        BUILD_SLAPD=yes
        BUILD_SHELL=yes
-       SLAPD_DEFS="-DLDAP_SHELL $SLAPD_DEFS"
 fi
 
 if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \
@@ -861,24 +845,15 @@ AC_SUBST(BUILD_SLAPD)
 AC_SUBST(BUILD_SLURPD)
 
 
-AC_SUBST(LDAP_DEFS)
 AC_SUBST(LDAP_LIBS)
-AC_SUBST(LDAPD_DEFS)
 AC_SUBST(LDAPD_LIBS)
-AC_SUBST(SLAPD_DEFS)
 AC_SUBST(SLAPD_LIBS)
-AC_SUBST(SLURPD_DEFS)
 AC_SUBST(SLURPD_LIBS)
-AC_SUBST(LDBM_DEFS)
 AC_SUBST(LDBM_LIBS)
-AC_SUBST(LTHREAD_DEFS)
 AC_SUBST(LTHREAD_LIBS)
-AC_SUBST(LUTIL_DEFS)
 AC_SUBST(LUTIL_LIBS)
 
-AC_SUBST(KRB_DEFS)
 AC_SUBST(KRB_LIBS)
-AC_SUBST(TERMCAP_DEFS)
 AC_SUBST(TERMCAP_LIBS)
 
 dnl ----------------------------------------------------------------