[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files Fix bug in configure script...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0a12b2ac0f5
branches:  trunk
changeset: 528559:c0a12b2ac0f5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon May 07 21:41:33 2007 +0000

description:
Fix bug in configure script, noticed by Thorsten Glaser.

diffstat:

 pkgtools/libnbcompat/files/configure    |  38 ++++++++++++++++----------------
 pkgtools/libnbcompat/files/configure.ac |   4 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diffs (111 lines):

diff -r 81b2ea57818c -r c0a12b2ac0f5 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure      Mon May 07 20:13:27 2007 +0000
+++ b/pkgtools/libnbcompat/files/configure      Mon May 07 21:41:33 2007 +0000
@@ -5511,9 +5511,9 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for SHA2File" >&5
-echo $ECHO_N "checking for SHA2File... $ECHO_C" >&6; }
-if test "${ac_cv_func_SHA2File+set}" = set; then
+{ echo "$as_me:$LINENO: checking for SHA512_File" >&5
+echo $ECHO_N "checking for SHA512_File... $ECHO_C" >&6; }
+if test "${ac_cv_func_SHA512_File+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -5522,12 +5522,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define SHA2File to an innocuous variant, in case <limits.h> declares SHA2File.
+/* Define SHA512_File to an innocuous variant, in case <limits.h> declares SHA512_File.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define SHA2File innocuous_SHA2File
+#define SHA512_File innocuous_SHA512_File
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char SHA2File (); below.
+    which can conflict with char SHA512_File (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -5537,7 +5537,7 @@
 # include <assert.h>
 #endif
 
-#undef SHA2File
+#undef SHA512_File
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -5545,18 +5545,18 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SHA2File ();
+char SHA512_File ();
 /* 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_SHA2File || defined __stub___SHA2File
+#if defined __stub_SHA512_File || defined __stub___SHA512_File
 choke me
 #endif
 
 int
 main ()
 {
-return SHA2File ();
+return SHA512_File ();
   ;
   return 0;
 }
@@ -5579,20 +5579,20 @@
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_func_SHA2File=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_SHA2File=no
+  ac_cv_func_SHA512_File=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_func_SHA512_File=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_SHA2File" >&5
-echo "${ECHO_T}$ac_cv_func_SHA2File" >&6; }
-if test $ac_cv_func_SHA2File = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_func_SHA512_File" >&5
+echo "${ECHO_T}$ac_cv_func_SHA512_File" >&6; }
+if test $ac_cv_func_SHA512_File = yes; then
   :
 else
 
diff -r 81b2ea57818c -r c0a12b2ac0f5 pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac   Mon May 07 20:13:27 2007 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac   Mon May 07 21:41:33 2007 +0000
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.53 2007/05/07 16:38:47 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.54 2007/05/07 21:41:34 joerg Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -125,7 +125,7 @@
        AC_LIBOBJ(sha1hl)
 ])
 
-AC_CHECK_FUNC(SHA2File, [:], [
+AC_CHECK_FUNC(SHA512_File, [:], [
                AC_DEFINE(HAVE_NBCOMPAT_SHA2)
        AH_TEMPLATE([HAVE_NBCOMPAT_SHA2], [
                Define to 1 if the `SHA2*' functions are built into the