From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Thu, 25 Aug 2005 02:03:29 +0000 (+0000)
Subject: * configure.in: wrap all LDAP and HESIOD tests in test whether
X-Git-Tag: before-clocktime-fixes~15
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=bc56ba16e0dbb00fdd75c69268be4b866424cd51;p=am-utils-6.1.git

* configure.in: wrap all LDAP and HESIOD tests in test whether
--with-OPT was used.

Clean up function calls.
---

diff --git a/ChangeLog b/ChangeLog
index 8659eff..0eeccce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-24  Erez Zadok  <ezk@cs.sunysb.edu>
+
+	* configure.in: wrap all LDAP and HESIOD tests in test whether
+	--with-OPT was used.
+
 2005-08-20  Daniel P. Ottavio  <dottavio@ic.sunysb.edu>
 
 	* amd/sun_map.c: Clean up #defines
@@ -9,8 +14,8 @@
 
 	* amd/sun_map_parse.y: Removed automap include functionality, it
 	will need to be re-implemented using a pre-processor.
-	Clean up fucntion calls.
-	
+	Clean up function calls.
+
 2005-08-16  Daniel P. Ottavio  <dottavio@ic.sunysb.edu>
 
 	* amd/sun2amd.c (sun2amd_convert): If the input line is too long
diff --git a/configure.in b/configure.in
index 64be017..effcf08 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.111 $)
+AC_REVISION($Revision: 1.112 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -286,10 +286,6 @@ AC_CHECK_FUNCS(			\
 	getpagesize		\
 	gettimeofday		\
 	hasmntopt		\
-	hes_init		\
-	hesiod_init		\
-	hesiod_reload		\
-	hesiod_to_bind		\
 	hstrerror		\
 	madvise			\
 	memcmp			\
@@ -340,6 +336,15 @@ AC_CHECK_FUNCS(			\
 	wait3			\
 	waitpid			\
 	)
+dnl optional functions
+if test "$with_hesiod" = "yes"; then
+AC_CHECK_FUNCS(			\
+	hes_init		\
+	hesiod_init		\
+	hesiod_reload		\
+	hesiod_to_bind		\
+	)
+fi
 AC_REPLACE_FUNCS(		\
 	clnt_sperrno		\
 	hasmntopt		\
@@ -530,9 +535,6 @@ dnl	dirent.h			\
 	ifaddrs.h			\
 	irs.h				\
 	grp.h				\
-	hesiod.h			\
-	lber.h				\
-	ldap.h				\
 	libgen.h			\
 	limits.h			\
 	malloc.h			\
@@ -565,6 +567,18 @@ dnl	dirent.h			\
 	varargs.h			\
 	unistd.h			\
 	)
+dnl optional headers
+if test "$with_ldap" = "yes"; then
+AC_CHECK_HEADERS(			\
+	lber.h				\
+	ldap.h				\
+	)
+fi
+if test "$with_hesiod" = "yes"; then
+AC_CHECK_HEADERS(			\
+	hesiod.h			\
+	)
+fi
 dnl headers which depend on others, else you get an configure error
 AC_CHECK_HEADERS([			\
 	linux/auto_fs.h			\
@@ -792,7 +806,9 @@ AMU_CHECK_EXTERNS(
 	)
 dnl Different macro to check for LDAP externs, so as to avoid
 dnl breaking the basic extern-checking macro.
+if test "$with_ldap" = "yes"; then
 AMU_CHECK_EXTERN_LDAP(ldap_enable_cache)
+fi
 dnl ======================================================================
 
 dnl ######################################################################