Commit 259d56da authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Use AC_DEFINE third argument to generate portable.h.in entries instead

of explicit acconfig.h entries.
parent 5ff97c0c
......@@ -40,222 +40,9 @@
#undef _SGI_MP_SOURCE
#endif
/* define this if cross compiling */
#undef CROSS_COMPILING
/* define this if toupper() requires tolower() check */
#undef C_UPPER_LOWER
/* define this to the number of arguments ctime_r() expects */
#undef CTIME_R_NARGS
/* define this to the number of arguments gethostbyaddr_r expects */
#undef GETHOSTBYADDR_R_NARGS
/* define this to the number of arguments gethostbyname_r expects */
#undef GETHOSTBYNAME_R_NARGS
/* define this if sys_errlist is not defined in stdio.h or errno.h */
#undef DECL_SYS_ERRLIST
/* define this if TIOCGWINSZ is defined in sys/ioctl.h */
#undef GWINSZ_IN_SYS_IOCTL
/* define if you have berkeley db */
#undef HAVE_BERKELEY_DB
/* define if you have berkeley db2 */
#undef HAVE_BERKELEY_DB2
/* define if you have crypt */
#undef HAVE_CRYPT
/* define if you have DSAP */
#undef HAVE_DSAP
/* define if you have GDBM */
#undef HAVE_GDBM
/* define if you have ISODE */
#undef HAVE_ISODE
/* define if you have Kerberos */
#undef HAVE_KERBEROS
/* define if you have LinuxThreads */
#undef HAVE_LINUX_THREADS
/* define if you have Sun LWP (SunOS style) */
#undef HAVE_LWP
/* define if you have -lncurses */
#undef HAVE_NCURSES
/* define if you have NDBM */
#undef HAVE_NDBM
/* define if you have Mach CThreads */
#undef HAVE_MACH_CTHREADS
/* define if you have POSIX termios */
#undef HAVE_POSIX_TERMIOS
/* define if you have PP */
#undef HAVE_PP
/* define if you have POSIX Threads */
#undef HAVE_PTHREADS
/* define if your POSIX Threads implementation is circa Final Draft */
#undef HAVE_PTHREADS_FINAL
/* define if your POSIX Threads implementation is circa Draft 4 */
#undef HAVE_PTHREADS_D4
/* define if you have ptrdiff_t */
#undef HAVE_PTRDIFF_T
/* define if you have res_search() */
#ifdef __notdef__
/* see second res_search define */
#undef HAVE_RES_SEARCH
#endif
/* define if you have sched_yield() */
#ifdef __notdef__
/* see second sched_yield define */
#undef HAVE_SCHED_YIELD
#endif
/* define if you have setproctitle() */
#undef HAVE_SETPROCTITLE
/* define if you have -lwrap */
#undef HAVE_TCPD
/* define if you have -ltermcap */
#undef HAVE_TERMCAP
/* define if you have Sun LWP (Solaris style) */
#undef HAVE_THR
/* define if you have XTPP */
#undef HAVE_XTPP
/* define this if select() implicitly yields in thread environments */
#undef HAVE_YIELDING_SELECT
/* define this for connectionless LDAP support */
#undef LDAP_CONNECTIONLESS
/* define this to add debugging code */
#undef LDAP_DEBUG
/* define this for LDAP DNS support */
#undef LDAP_DNS
/* define this to remove -lldap cache support */
#undef LDAP_NOCACHE
/* define this for LDAP process title support */
#undef LDAP_PROCTITLE
/* define this for LDAP User Interface support */
#undef LDAP_LIBUI
/* define this to add syslog code */
#undef LDAP_SYSLOG
/* define this to use DB2 in native mode */
#undef LDBM_USE_DB2
/* define this to use DB2 in compat185 mode */
#undef LDBM_USE_DB2_COMPAT185
/* define this to use DBBTREE w/ LDBM backend */
#undef LDBM_USE_DBBTREE
/* define this to use DBHASH w/ LDBM backend */
#undef LDBM_USE_DBHASH
/* define this to use GDBM w/ LDBM backend */
#undef LDBM_USE_GDBM
/* define this to use NDBM w/ LDBM backend */
#undef LDBM_USE_NDBM
/* define this if you want no termcap support */
#undef NO_TERMCAP
/* define this if you want no thread support */
#undef NO_THREADS
/* define this to use SLAPD Berkeley DB2 backend */
#undef SLAPD_BDB2
/* define this to compile SLAPD DB2 backend as a dynamic module*/
#undef SLAPD_BDB2_DYNAMIC
/* define this for ClearText password support */
#undef SLAPD_CLEARTEXT
/* define this for crypt(3) password support */
#undef SLAPD_CRYPT
/* define this to use SLAPD LDAP backend */
#undef SLAPD_LDAP
/* define this to compile SLAPD LDAP backend as a dynamic module*/
#undef SLAPD_LDAP_DYNAMIC
/* define this to use SLAPD LDBM backend */
#undef SLAPD_LDBM
/* define this to compile SLAPD LDBM backend as a dynamic module*/
#undef SLAPD_LDBM_DYNAMIC
/* define this to use SLAPD Modules */
#undef SLAPD_MODULES
/* define this to use SLAPD passwd backend */
#undef SLAPD_PASSWD
/* define this to compile SLAPD passwd backend as a dynamic module*/
#undef SLAPD_PASSWD_DYNAMIC
/* define this to use SLAPD Perl backend */
#undef SLAPD_PERL
/* define this to compile SLAPD Perl backend as a dynamic module*/
#undef SLAPD_PERL_DYNAMIC
/* define this for phonetic support */
#undef SLAPD_PHONETIC
/* define this for Reverse Lookup support */
#undef SLAPD_RLOOKUPS
/* define this to use SLAPD shell backend */
#undef SLAPD_SHELL
/* define this to compile SLAPD shell backend as a dynamic module*/
#undef SLAPD_SHELL_DYNAMIC
/* define this to use SLAPD TCL backend */
#undef SLAPD_TCL
/* define this to compile SLAPD TCL backend as a dynamic module*/
#undef SLAPD_TCL_DYNAMIC
/* define this to be empty if your compiler doesn't support volatile */
#undef volatile
/* define this if sig_atomic_t isn't defined in signal.h */
#undef sig_atomic_t
/* define this if socklen_t isn't defined in sys/types.h or sys/socket.h */
#undef socklen_t
/* These are defined in ldap_features.h */
/*
LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
......@@ -263,6 +50,7 @@
LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
*/
/* These are defined in lber_types.h */
/*
LBER_INT_T
......
......@@ -729,7 +729,7 @@ AC_DEFUN(OL_C_VOLATILE,
if test $ol_cv_c_volatile = yes; then
:
else
AC_DEFINE(volatile,)
AC_DEFINE(volatile,,[define as empty if volatile is not supported])
fi
])dnl
dnl
......@@ -740,7 +740,8 @@ AC_DEFUN(OL_TYPE_SIG_ATOMIC_T,
[AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])
if test $ol_cv_type_sig_atomic_t = no; then
AC_DEFINE(sig_atomic_t, int)
AC_DEFINE(sig_atomic_t,int,
[define to atomic type if sig_atomic_t is not available])
fi
])dnl
dnl
......@@ -758,7 +759,8 @@ AC_DEFUN(OL_TYPE_SOCKLEN_T,
], [socklen_t len;],
ol_cv_type_socklen_t=yes, ol_cv_type_socklen_t=no)])
if test $ol_cv_type_socklen_t = no; then
AC_DEFINE(socklen_t, int)
AC_DEFINE(socklen_t, int,
[define to int if socklen_t is not available])
fi
])dnl
dnl
......
......@@ -548,11 +548,13 @@ AC_CHECK_FUNCS(res_search)
if test $ac_cv_func_res_search = "no" ; then
AC_CHECK_LIB(bind, res_search)
if test "$ac_cv_lib_bind_res_search" = "yes" ; then
AC_DEFINE(HAVE_RES_SEARCH,1)
AC_DEFINE(HAVE_RES_SEARCH,1,
[define if you have res_search()])
else
AC_CHECK_LIB(resolv, res_search)
if test "$ac_cv_lib_resolv_res_search" = "yes" ; then
AC_DEFINE(HAVE_RES_SEARCH,1)
AC_DEFINE(HAVE_RES_SEARCH,1,
[define if you have res_search()])
fi
fi
fi
......@@ -930,7 +932,8 @@ dnl [ol_cv_pthread_lpthread_lexc])
dnl Digital UNIX has sched_yield() in -lrt
AC_CHECK_LIB(rt, sched_yield,
[LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
AC_DEFINE(HAVE_SCHED_YIELD,1)
AC_DEFINE(HAVE_SCHED_YIELD,1,
[Define if you have the sched_yield function.])
ac_cv_func_sched_yield=yes],
[ac_cv_func_sched_yield=no])
fi
......@@ -1350,9 +1353,11 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then
ol_with_ldbm_api=db2
if test $ol_with_ldbm_type = hash ; then
AC_DEFINE(LDBM_USE_DBHASH,1)
AC_DEFINE(LDBM_USE_DBHASH,1,
[define this to use DBHASH w/ LDBM backend])
else
AC_DEFINE(LDBM_USE_DBBTREE,1)
AC_DEFINE(LDBM_USE_DBBTREE,1,
[define this to use DBBTREE w/ LDBM backend])
fi
dnl $ol_cv_lib_db2 should be yes or -ldb
......@@ -1376,9 +1381,11 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then
ol_with_ldbm_api=db
if test $ol_with_ldbm_type = hash ; then
AC_DEFINE(LDBM_USE_DBHASH,1)
AC_DEFINE(LDBM_USE_DBHASH,1,
[define this to use DBHASH w/ LDBM backend])
else
AC_DEFINE(LDBM_USE_DBBTREE,1)
AC_DEFINE(LDBM_USE_DBBTREE,1,
[define this to use DBBTREE w/ LDBM backend])
fi
dnl $ol_cv_lib_db should be yes or -ldb
......@@ -1589,7 +1596,7 @@ if test $ol_enable_crypt != no ; then
have_crypt=yes], [have_crypt=no])])
if test $have_crypt = yes ; then
AC_DEFINE(HAVE_CRYPT,1)
AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
else
AC_MSG_WARN(could not find crypt)
if test $ol_enable_crypt = yes ; then
......@@ -1611,7 +1618,8 @@ if test $ol_enable_proctitle != no ; then
LIBOBJS="$LIBOBJS setproctitle.o"])])
if test $have_setproctitle = yes ; then
AC_DEFINE(HAVE_SETPROCTITLE,1)
AC_DEFINE(HAVE_SETPROCTITLE,1,
[define if setproctitle(3) is available])
fi
fi
......@@ -1796,114 +1804,126 @@ dnl ----------------------------------------------------------------
dnl Sort out defines
if test "$ol_enable_debug" != no ; then
AC_DEFINE(LDAP_DEBUG,1)
AC_DEFINE(LDAP_DEBUG,1,
[define this to add debugging code])
fi
if test "$ol_enable_syslog" = yes ; then
AC_DEFINE(LDAP_SYSLOG,1)
AC_DEFINE(LDAP_SYSLOG,1,
[define this to add syslog code])
fi
if test "$ol_enable_libui" = yes ; then
AC_DEFINE(LDAP_LIBUI,1)
AC_DEFINE(LDAP_LIBUI,1,
[define this for LDAP User Interface support])
fi
if test "$ol_enable_cache" = no ; then
AC_DEFINE(LDAP_NOCACHE,1)
AC_DEFINE(LDAP_NOCACHE,1,
[define this to remove -lldap cache support])
fi
if test "$ol_enable_dns" != no ; then
AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_VENDOR_VERSION)
fi
if test "$ol_enable_proctitle" != no ; then
AC_DEFINE(LDAP_PROCTITLE,1)
AC_DEFINE(LDAP_PROCTITLE,1,
[define this for LDAP process title support])
fi
if test "$ol_enable_referrals" != no ; then
AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION)
fi
if test "$ol_enable_cldap" != no ; then
AC_DEFINE(LDAP_CONNECTIONLESS,1)
AC_DEFINE(LDAP_CONNECTIONLESS,1,[define to support CLDAP])
fi
if test "$ol_enable_crypt" != no ; then
AC_DEFINE(SLAPD_CRYPT,1)
AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
fi
if test "$ol_enable_cleartext" != no ; then
AC_DEFINE(SLAPD_CLEARTEXT,1)
AC_DEFINE(SLAPD_CLEARTEXT,1,[define to support cleartext passwords])
fi
if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
fi
if test "$ol_enable_rlookups" != no ; then
AC_DEFINE(SLAPD_RLOOKUPS,1)
AC_DEFINE(SLAPD_RLOOKUPS,1,[define to support reverse lookups])
fi
if test "$ol_link_modules" != no ; then
AC_DEFINE(SLAPD_MODULES,1)
AC_DEFINE(SLAPD_MODULES,1,[define to support modules])
BUILD_SLAPD=yes
fi
if test "$ol_link_bdb2" != no ; then
AC_DEFINE(SLAPD_BDB2,1)
AC_DEFINE(SLAPD_BDB2,1,[define to support BDB2 backend])
BUILD_SLAPD=yes
BUILD_BDB2=yes
if test "$ol_with_bdb2_module" != static ; then
AC_DEFINE(SLAPD_BDB2_DYNAMIC,1)
AC_DEFINE(SLAPD_BDB2_DYNAMIC,1,
[define to support dynamic BDB2 backend])
BUILD_BDB2_DYNAMIC=yes
fi
fi
if test "$ol_enable_ldap" != no ; then
AC_DEFINE(SLAPD_LDAP,1)
AC_DEFINE(SLAPD_LDAP,1,[define to support LDAP backend])
BUILD_SLAPD=yes
BUILD_LDAP=yes
if test "$ol_with_ldap_module" != static ; then
AC_DEFINE(SLAPD_LDAP_DYNAMIC,1)
AC_DEFINE(SLAPD_LDAP_DYNAMIC,1,
[define to support dynamic LDAP backend])
BUILD_LDAP_DYNAMIC=yes
fi
fi
if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])
BUILD_SLAPD=yes
BUILD_LDBM=yes
if test "$ol_with_ldbm_module" != static ; then
AC_DEFINE(SLAPD_LDBM_DYNAMIC,1)
AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,
[define to support dynamic LDBM backend])
BUILD_LDBM_DYNAMIC=yes
fi
fi
if test "$ol_enable_passwd" != no ; then
AC_DEFINE(SLAPD_PASSWD,1)
AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend])
BUILD_SLAPD=yes
BUILD_PASSWD=yes
if test "$ol_with_passwd_module" != static ; then
AC_DEFINE(SLAPD_PASSWD_DYNAMIC,1)
AC_DEFINE(SLAPD_PASSWD_DYNAMIC,1,
[define to support dynamic PASSWD backend])
BUILD_PASSWD_DYNAMIC=yes
fi
fi
if test "$ol_link_perl" != no ; then
AC_DEFINE(SLAPD_PERL,1)
AC_DEFINE(SLAPD_PERL,1,[define to support PERL backend])
BUILD_SLAPD=yes
BUILD_PERL=yes
if test "$ol_with_perl_module" != static ; then
AC_DEFINE(SLAPD_PERL_DYNAMIC,1)
AC_DEFINE(SLAPD_PERL_DYNAMIC,1,
[define to support dynamic PERL backend])
BUILD_PERL_DYNAMIC=yes
fi
fi
if test "$ol_enable_shell" != no ; then
AC_DEFINE(SLAPD_SHELL,1)
AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
BUILD_SLAPD=yes
BUILD_SHELL=yes
if test "$ol_with_shell_module" != static ; then
AC_DEFINE(SLAPD_SHELL_DYNAMIC,1)
AC_DEFINE(SLAPD_SHELL_DYNAMIC,1,
[define to support dynamic SHELL backend])
BUILD_SHELL_DYNAMIC=yes
fi
fi
if test "$ol_enable_tcl" != no ; then
AC_DEFINE(SLAPD_TCL,1)
AC_DEFINE(SLAPD_TCL,1,[define to support TCL backend])
BUILD_SLAPD=yes
BUILD_TCL=yes
if test "$ol_with_tcl_module" != static; then
AC_DEFINE(SLAPD_TCL_DYNAMIC,1)
AC_DEFINE(SLAPD_TCL_DYNAMIC,1,
[define to support dynamic TCL backend])
BUILD_TCL_DYNAMIC=yes
fi
fi
......
......@@ -122,114 +122,6 @@
#undef _SGI_MP_SOURCE
#endif
/* define if you have crypt */
#undef HAVE_CRYPT
/* define if you have res_search() */
#ifdef __notdef__
/* see second res_search define */
#undef HAVE_RES_SEARCH
#endif
/* define if you have sched_yield() */
#ifdef __notdef__
/* see second sched_yield define */
#undef HAVE_SCHED_YIELD
#endif
/* define if you have setproctitle() */
#undef HAVE_SETPROCTITLE
/* define this for connectionless LDAP support */
#undef LDAP_CONNECTIONLESS
/* define this to add debugging code */
#undef LDAP_DEBUG
/* define this to remove -lldap cache support */
#undef LDAP_NOCACHE
/* define this for LDAP process title support */
#undef LDAP_PROCTITLE
/* define this for LDAP User Interface support */
#undef LDAP_LIBUI
/* define this to add syslog code */
#undef LDAP_SYSLOG
/* define this to use DBBTREE w/ LDBM backend */
#undef LDBM_USE_DBBTREE
/* define this to use DBHASH w/ LDBM backend */
#undef LDBM_USE_DBHASH
/* define this to use SLAPD Berkeley DB2 backend */
#undef SLAPD_BDB2
/* define this to compile SLAPD DB2 backend as a dynamic module*/
#undef SLAPD_BDB2_DYNAMIC
/* define this for ClearText password support */
#undef SLAPD_CLEARTEXT
/* define this for crypt(3) password support */
#undef SLAPD_CRYPT
/* define this to use SLAPD LDAP backend */
#undef SLAPD_LDAP
/* define this to compile SLAPD LDAP backend as a dynamic module*/
#undef SLAPD_LDAP_DYNAMIC
/* define this to use SLAPD LDBM backend */
#undef SLAPD_LDBM
/* define this to compile SLAPD LDBM backend as a dynamic module*/
#undef SLAPD_LDBM_DYNAMIC
/* define this to use SLAPD Modules */
#undef SLAPD_MODULES
/* define this to use SLAPD passwd backend */
#undef SLAPD_PASSWD
/* define this to compile SLAPD passwd backend as a dynamic module*/
#undef SLAPD_PASSWD_DYNAMIC
/* define this to use SLAPD Perl backend */
#undef SLAPD_PERL
/* define this to compile SLAPD Perl backend as a dynamic module*/
#undef SLAPD_PERL_DYNAMIC
/* define this for phonetic support */
#undef SLAPD_PHONETIC
/* define this for Reverse Lookup support */
#undef SLAPD_RLOOKUPS
/* define this to use SLAPD shell backend */
#undef SLAPD_SHELL
/* define this to compile SLAPD shell backend as a dynamic module*/
#undef SLAPD_SHELL_DYNAMIC
/* define this to use SLAPD TCL backend */
#undef SLAPD_TCL
/* define this to compile SLAPD TCL backend as a dynamic module*/
#undef SLAPD_TCL_DYNAMIC
/* define this to be empty if your compiler doesn't support volatile */
#undef volatile
/* define this if sig_atomic_t isn't defined in signal.h */
#undef sig_atomic_t
/* define this if socklen_t isn't defined in sys/types.h or sys/socket.h */
#undef socklen_t
/* These are defined in ldap_features.h */
/*
LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
......@@ -237,6 +129,7 @@
LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
*/
/* These are defined in lber_types.h */
/*
LBER_INT_T
......@@ -683,6 +576,12 @@
/* defined to be the EXE extension */
#undef EXEEXT
/* define if you have res_search() */
#undef HAVE_RES_SEARCH
/* define if you have res_search() */
#undef HAVE_RES_SEARCH
/* define if you have -lxttp */
#undef HAVE_XTPP
......@@ -731,6 +630,9 @@
/* define if you have POSIX Threads */
#undef HAVE_PTHREADS
/* Define if you have the sched_yield function. */
#undef HAVE_SCHED_YIELD
/* define if you have pthread_detach function */
#undef HAVE_PTHREAD_DETACH
......@@ -755,9 +657,21 @@
/* define if Berkeley DBv2 is available */
#undef HAVE_BERKELEY_DB2
/* define this to use DBHASH w/ LDBM backend */
#undef LDBM_USE_DBHASH
/* define this to use DBBTREE w/ LDBM backend */
#undef LDBM_USE_DBBTREE
/* define if Berkeley DB is available */
#undef HAVE_BERKELEY_DB
/* define this to use DBHASH w/ LDBM backend */
#undef LDBM_USE_DBHASH
/* define this to use DBBTREE w/ LDBM backend */
#undef LDBM_USE_DBBTREE
/* define if MDBM is available */
#undef HAVE_MDBM
......@@ -782,6 +696,12 @@
/* define if you have -lreadline */
#undef HAVE_READLINE
/* define if crypt(3) is available */
#undef HAVE_CRYPT
/* define if setproctitle(3) is available */
#undef HAVE_SETPROCTITLE
/* define if system uses EBCDIC instead of ASCII */
#undef HAVE_EBCDIC
......@@ -794,6 +714,12 @@
/* Define if system has ptrdiff_t type */
#undef HAVE_PTRDIFF_T
/* define to atomic type if sig_atomic_t is not available */
#undef sig_atomic_t