top_builddir=`pwd`
AC_SUBST(top_builddir)dnl
-ldap_subdir="openldap"
-
-AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [
- if test "$withval" = "no"; then
- ldap_subdir=""
- elif test "$withval" != "yes"; then
+ldap_subdir="/openldap"
+
+AC_ARG_WITH(subdir,
+[ --with-subdir=DIR change default subdirectory used for installs],
+[case "$withval" in
+ no) ldap_subdir=""
+ ;;
+ yes)
+ ;;
+ /*|\\*)
ldap_subdir="$withval"
- fi
+ ;;
+ *)
+ ldap_subdir="/$withval"
+ ;;
+esac
])dnl
AC_SUBST(ldap_subdir)dnl
BUILD_TCL=no
BUILD_THREAD=no
-BUILD_BDB2_DYNAMIC=no
-BUILD_LDAP_DYNAMIC=no
-BUILD_LDBM_DYNAMIC=no
-BUILD_PASSWD_DYNAMIC=no
-BUILD_PERL_DYNAMIC=no
-BUILD_SHELL_DYNAMIC=no
-BUILD_TCL_DYNAMIC=no
+BUILD_BDB2_DYNAMIC=static
+BUILD_LDAP_DYNAMIC=static
+BUILD_LDBM_DYNAMIC=static
+BUILD_PASSWD_DYNAMIC=static
+BUILD_PERL_DYNAMIC=static
+BUILD_SHELL_DYNAMIC=static
+BUILD_TCL_DYNAMIC=static
SLAPD_MODULES_LDFLAGS=
SLAPD_MODULES_CPPFLAGS=
+SLAPD_MODULES_LIST=
SLAPD_PERL_LDFLAGS=
SLAPD_PERL_CPPFLAGS=
SASL_LIBS=
TERMCAP_LIBS=
TLS_LIBS=
+MODULES_LIBS=
dnl ----------------------------------------------------------------
dnl Checks for programs
dnl (for now, let autoconf sort this out)
dnl CFLAGS=${CFLAGS-""}
+AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
dnl AC_PROG_MAKE_SET
dnl
ol_link_modules=no
if test $ol_enable_modules != no ; then
- AC_PATH_PROG(GLIBCONFIG, glib-config)
+ AC_CHECK_HEADERS(ltdl.h)
- if test "no$GLIBCONFIG" = "no" ; then
- if test $ol_enable_modules = yes ; then
- AC_MSG_ERROR([could not locate glib-config])
- fi
+ if test $ac_cv_header_ltdl_h = no ; then
+ AC_MSG_ERROR([could not locate libtool ltdl.h])
- else
- SLAPD_MODULES_VERSION="`$GLIBCONFIG --version gmodule`"
- SLAPD_MODULES_CPPFLAGS="`$GLIBCONFIG --cflags gmodule`"
- SLAPD_MODULES_LDFLAGS="`$GLIBCONFIG --libs gmodule`"
+ fi
- dnl should check glib version
- ol_link_modules=yes
+ AC_CHECK_LIB(ltdl, lt_dlinit)
+ if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
+ AC_MSG_ERROR([could not locate libtool -lltdl])
fi
+ ol_link_modules=yes
else
ol_with_bdb2_module=static
ol_with_ldap_module=static
dnl HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
+dnl Check for resolver routines
+AC_CHECK_FUNC(res_search,:)
+if test $ac_cv_func_res_search = no ; then
+ AC_CHECK_LIB(bind, res_search)
+ ac_cv_func_res_search=$ac_cv_lib_bind_res_search
+fi
-# find res_search
-if test $ol_enable_dns != no ; then
- dnl Check for resolver routines
- AC_CHECK_FUNC(res_search,:)
- if test $ac_cv_func_res_search = no ; then
- AC_CHECK_LIB(bind, res_search)
- ac_cv_func_res_search=$ac_cv_lib_bind_res_search
- fi
- if test $ac_cv_func_res_search = no ; then
- AC_CHECK_LIB(bind, __res_search)
- ac_cv_func_res_search=$ac_cv_lib_bind___res_search
- fi
- if test $ac_cv_func_res_search = no ; then
- AC_CHECK_LIB(resolv, res_search)
- ac_cv_func_res_search=$ac_cv_lib_resolv_res_search
- fi
+if test $ac_cv_func_res_search = no ; then
+ AC_CHECK_LIB(bind, __res_search)
+ ac_cv_func_res_search=$ac_cv_lib_bind___res_search
+fi
- if test "$ac_cv_func_res_search" = yes ; then
- AC_DEFINE(HAVE_RES_SEARCH,1,
- [define if you have res_search()])
- elif test $ol_enable_dns = yes ; then
- AC_MSG_ERROR([--enable-dns requires res_search])
- else
- AC_MSG_WARN([no res_search, disabling DNS support])
- fi
+if test $ac_cv_func_res_search = no ; then
+ AC_CHECK_LIB(resolv, res_search)
+ ac_cv_func_res_search=$ac_cv_lib_resolv_res_search
+fi
+
+if test "$ac_cv_func_res_search" = yes ; then
+ AC_DEFINE(HAVE_RES_SEARCH,1,
+ [define if you have res_search()])
+elif test $ol_enable_dns = yes ; then
+ AC_MSG_ERROR([--enable-dns requires res_search])
+elif test $ol_enable_dns != no ; then
+ AC_MSG_WARN([no res_search, disabling DNS support])
fi
dnl pthread_create() in $LIBS
dnl
dnl Check special pthread (final) flags
- dnl pthread_create() with -mt (Solaris)
+ dnl [skipped] pthread_create() with -mt (Solaris) [disabled]
dnl pthread_create() with -kthread (FreeBSD)
dnl pthread_create() with -pthread (FreeBSD/Digital Unix)
dnl pthread_create() with -pthreads (?)
dnl Check pthread (final) libraries
dnl pthread_mutex_unlock() in -lpthread -lmach -lexc -lc_r (OSF/1)
dnl pthread_mutex_lock() in -lpthread -lmach -lexc (OSF/1)
- dnl (skipped) pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
+ dnl [skipped] pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
dnl pthread_join() -Wl,-woff,85 -lpthread (IRIX)
dnl pthread_create() in -lpthread (many)
dnl pthread_create() in -lc_r (FreeBSD)
dnl pthread_create in $LIBS
AC_CACHE_CHECK([for pthread_create in default libraries],
ol_cv_pthread_create,[
- AC_TRY_RUN([
-#include <pthread.h>
-#ifndef NULL
-#define NULL (void*)0
-#endif
-
-static void *task(p)
- void *p;
-{
- return (void *) (p == NULL);
-}
-
-int main(argc, argv)
- int argc;
- char **argv;
-{
- pthread_t t;
- int status;
-
- /* make sure pthread_create() isn't just a stub */
-#if HAVE_PTHREADS_D4
- status = pthread_create(&t, pthread_attr_default, task, NULL);
-#else
- status = pthread_create(&t, NULL, task, NULL);
-#endif
-
- if( status ) return status;
-
- /* make sure pthread_detach() isn't just a stub */
-#if HAVE_PTHREADS_D4
- status = pthread_detach( &t );
-#else
- status = pthread_detach( t );
-#endif
-
- return status;
-}
-],
+ AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
[ol_cv_pthread_create=yes],
[ol_cv_pthread_create=no],
- [dnl assume yes
- ol_cv_pthread_create=yes])])
+ [AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION,
+ [ol_cv_pthread_create=yes],
+ [ol_cv_pthread_create=no])])])
if test $ol_cv_pthread_create != no ; then
ol_link_threads=posix
ol_link_pthreads=""
fi
- OL_PTHREAD_TRY_LINK([-mt], [ol_cv_pthread_mt])
- OL_PTHREAD_TRY_LINK([-kthread], [ol_cv_pthread_kthread])
- OL_PTHREAD_TRY_LINK([-pthread], [ol_cv_pthread_pthread])
- OL_PTHREAD_TRY_LINK([-pthreads],[ol_cv_pthread_pthreads])
- OL_PTHREAD_TRY_LINK([-mthreads],[ol_cv_pthread_mthreads])
- OL_PTHREAD_TRY_LINK([-thread], [ol_cv_pthread_thread])
-
- OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc -lc_r],
+dnl OL_PTHREAD_TRY([-mt], [ol_cv_pthread_mt])
+ OL_PTHREAD_TRY([-kthread], [ol_cv_pthread_kthread])
+ OL_PTHREAD_TRY([-pthread], [ol_cv_pthread_pthread])
+ OL_PTHREAD_TRY([-pthreads], [ol_cv_pthread_pthreads])
+ OL_PTHREAD_TRY([-mthreads], [ol_cv_pthread_mthreads])
+ OL_PTHREAD_TRY([-thread], [ol_cv_pthread_thread])
+
+ OL_PTHREAD_TRY([-lpthread -lmach -lexc -lc_r],
[ol_cv_pthread_lpthread_lmach_lexc_lc_r])
- OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc],
+ OL_PTHREAD_TRY([-lpthread -lmach -lexc],
[ol_cv_pthread_lpthread_lmach_lexc])
-dnl OL_PTHREAD_TRY_LINK([-lpthread -lexc],
+dnl OL_PTHREAD_TRY([-lpthread -lexc],
dnl [ol_cv_pthread_lpthread_lexc])
- OL_PTHREAD_TRY_LINK([-lpthread -Wl,-woff,85],
+ OL_PTHREAD_TRY([-lpthread -Wl,-woff,85],
[ol_cv_pthread_lib_lpthread_woff])
- OL_PTHREAD_TRY_LINK([-lpthread],[ol_cv_pthread_lpthread])
- OL_PTHREAD_TRY_LINK([-lc_r], [ol_cv_pthread_lc_r])
+ OL_PTHREAD_TRY([-lpthread], [ol_cv_pthread_lpthread])
+ OL_PTHREAD_TRY([-lc_r], [ol_cv_pthread_lc_r])
- OL_PTHREAD_TRY_LINK([-threads], [ol_cv_pthread_threads])
+ OL_PTHREAD_TRY([-threads], [ol_cv_pthread_threads])
- OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc -lc_r],
+ OL_PTHREAD_TRY([-lpthreads -lmach -lexc -lc_r],
[ol_cv_pthread_lpthreads_lmach_lexc_lc_r])
- OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc],
+ OL_PTHREAD_TRY([-lpthreads -lmach -lexc],
[ol_cv_pthread_lpthreads_lmach_lexc])
- OL_PTHREAD_TRY_LINK([-lpthreads -lexc],
+ OL_PTHREAD_TRY([-lpthreads -lexc],
[ol_cv_pthread_lpthreads_lexc])
- OL_PTHREAD_TRY_LINK([-lpthreads], [ol_cv_pthread_lib_lpthreads])
+ OL_PTHREAD_TRY([-lpthreads],[ol_cv_pthread_lib_lpthreads])
if test $ol_link_threads != no ; then
AC_DEFINE(HAVE_PTHREADS,1,
AC_CACHE_CHECK([if pthread_create() works],
ol_cv_pthread_create_works,[
- AC_TRY_RUN([
-#include <pthread.h>
-#ifndef NULL
-#define NULL (void*)0
-#endif
-
-static void *task(p)
- void *p;
-{
- return (void *) (p == NULL);
-}
-
-int main(argc, argv)
- int argc;
- char **argv;
-{
- pthread_t t;
-#if HAVE_PTHREADS_D4
- exit(pthread_create(&t, pthread_attr_default, task, NULL));
-#else
- exit(pthread_create(&t, NULL, task, NULL));
-#endif
-}
-],
+ AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
[ol_cv_pthread_create_works=yes],
[ol_cv_pthread_create_works=no],
[dnl assume yes
if test "$ol_link_modules" != no ; then
AC_DEFINE(SLAPD_MODULES,1,[define to support modules])
BUILD_SLAPD=yes
+ MODULES_LIBS=-lltdl
+ SLAPD_MODULES_LDFLAGS="-dlopen self"
fi
if test "$ol_link_bdb2" != no ; then
if test "$ol_with_bdb2_module" != static ; then
AC_DEFINE(SLAPD_BDB2_DYNAMIC,1,
[define to support dynamic BDB2 backend])
- BUILD_BDB2_DYNAMIC=yes
+ BUILD_BDB2=mod
+ BUILD_BDB2_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb2/back_bdb2.la"
fi
fi
if test "$ol_with_ldap_module" != static ; then
AC_DEFINE(SLAPD_LDAP_DYNAMIC,1,
[define to support dynamic LDAP backend])
- BUILD_LDAP_DYNAMIC=yes
+ BUILD_LDAP=mod
+ BUILD_LDAP_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la"
fi
fi
if test "$ol_with_ldbm_module" != static ; then
AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,
[define to support dynamic LDBM backend])
- BUILD_LDBM_DYNAMIC=yes
+ BUILD_LDBM=mod
+ BUILD_LDBM_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la"
fi
fi
if test "$ol_with_passwd_module" != static ; then
AC_DEFINE(SLAPD_PASSWD_DYNAMIC,1,
[define to support dynamic PASSWD backend])
- BUILD_PASSWD_DYNAMIC=yes
+ BUILD_PASSWD=mod
+ BUILD_PASSWD_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la"
fi
fi
if test "$ol_with_perl_module" != static ; then
AC_DEFINE(SLAPD_PERL_DYNAMIC,1,
[define to support dynamic PERL backend])
- BUILD_PERL_DYNAMIC=yes
+ BUILD_PERL=mod
+ BUILD_PERL_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la"
fi
fi
if test "$ol_with_shell_module" != static ; then
AC_DEFINE(SLAPD_SHELL_DYNAMIC,1,
[define to support dynamic SHELL backend])
- BUILD_SHELL_DYNAMIC=yes
+ BUILD_SHELL=mod
+ BUILD_SHELL_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la"
fi
fi
if test "$ol_with_tcl_module" != static; then
AC_DEFINE(SLAPD_TCL_DYNAMIC,1,
[define to support dynamic TCL backend])
- BUILD_TCL_DYNAMIC=yes
+ BUILD_TCL=mod
+ BUILD_TCL_DYNAMIC=shared
+ SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-tcl/back_tcl.la"
fi
fi
AC_SUBST(SLAPD_MODULES_CPPFLAGS)
AC_SUBST(SLAPD_MODULES_LDFLAGS)
+AC_SUBST(SLAPD_MODULES_LIST)
AC_SUBST(SLAPD_PERL_CPPFLAGS)
AC_SUBST(SLAPD_PERL_LDFLAGS)
AC_SUBST(SASL_LIBS)
AC_SUBST(TERMCAP_LIBS)
AC_SUBST(TLS_LIBS)
+AC_SUBST(MODULES_LIBS)
dnl ----------------------------------------------------------------
dnl final output
servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
-servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/srv.mk \
+servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/mod.mk \
servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \
-servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \
-servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \
-servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \
-servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \
-servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/srv.mk \
+servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \
+servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \
+servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \
+servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \
+servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/mod.mk \
servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
projects / openldap / blobdiff