From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 14 Nov 2005 18:32:27 +0000 (+0000)
Subject: memrchr detection cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8e5086e8e70c67c502f7cd519937e3130b2554bc;p=openldap

memrchr detection cleanup
---

diff --git a/configure b/configure
index 321863f372..ca49021c91 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.602 2005/10/14 01:40:05 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.603 2005/11/13 21:26:59 ando Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -40342,105 +40342,6 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for memrchr" >&5
-echo $ECHO_N "checking for memrchr... $ECHO_C" >&6
-if test "${ac_cv_func_memrchr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define memrchr to an innocuous variant, in case <limits.h> declares memrchr.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define memrchr innocuous_memrchr
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char memrchr (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef memrchr
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char memrchr ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_memrchr) || defined (__stub___memrchr)
-choke me
-#else
-char (*f) () = memrchr;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != memrchr;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_memrchr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_memrchr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_memrchr" >&5
-echo "${ECHO_T}$ac_cv_func_memrchr" >&6
-if test $ac_cv_func_memrchr = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MEMRCHR 1
-_ACEOF
-
-fi
-
-
 
 for ac_func in strftime
 do
@@ -41357,6 +41258,7 @@ fi
 
 
 
+
 
 
 for ac_func in \
@@ -41382,6 +41284,7 @@ for ac_func in \
 	lockf			\
 	memcpy			\
 	memmove			\
+	memrchr			\
 	mkstemp			\
 	mktemp			\
 	pipe			\
diff --git a/configure.in b/configure.in
index 83839d3a4f..be9a104c02 100644
--- a/configure.in
+++ b/configure.in
@@ -2490,8 +2490,6 @@ if test $ac_cv_func_memcmp_working = no ; then
 		[define if memcmp is not 8-bit clean or is otherwise broken])
 fi
 
-AC_CHECK_FUNC(memrchr, AC_DEFINE(HAVE_MEMRCHR,1,[if you have memrchr()]))
-
 AC_FUNC_STRFTIME
 
 OL_FUNC_INET_ATON
@@ -2537,6 +2535,7 @@ AC_CHECK_FUNCS(		\
 	lockf			\
 	memcpy			\
 	memmove			\
+	memrchr			\
 	mkstemp			\
 	mktemp			\
 	pipe			\
diff --git a/include/portable.hin b/include/portable.hin
index dc3155b71f..b35359d1f6 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -397,7 +397,7 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* if you have memrchr() */
+/* Define to 1 if you have the `memrchr' function. */
 #undef HAVE_MEMRCHR
 
 /* Define to 1 if you have the `mkstemp' function. */