Removed spurious #ifdef from sha1.h

extension now uses stub library on UNIX
tcltk · Aug 19, 1999 · 2dc8cd5 · 2dc8cd5
1 parent 2420bb3
commit 2dc8cd5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,3 +1,15 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4a
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 # Copyright (c) 1999 Scriptics Corporation.
 
 #------------------------------------------------------------------------
@@ -1782,7 +1794,7 @@ AC_DEFUN(SC_MAKE_LIB, [
 	    ;;
 	*)
 	    MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(\[$]@_OBJECTS)"
-	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(\[$]@_OBJECTS) \${SHLIB_LDFLAGS} ${SHLIB_LD_LIBS}"
+	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(\[$]@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
 	    ;;
     esac
 
@@ -1814,6 +1826,7 @@ AC_DEFUN(SC_MAKE_LIB, [
 #	Defines the following vars:
 #		${basename}_LIB_NAME	The computed library name.
 #------------------------------------------------------------------------
+
 AC_DEFUN(SC_LIB_NAME, [
     AC_MSG_CHECKING(for $1 library file)
     eval "sc_lib_name_dir=${libdir}"

diff --git a/configure.in b/configure.in
@@ -254,7 +254,7 @@ case "`uname -s`" in
 	;;
     *)
 	if test "${SHARED_BUILD}" = "1" ; then
-	    SHLIB_LD_LIBS=""
+	    SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC}"
 	    eval "TCLSHA_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
 	    RANLIB=:
 	else

diff --git a/sha1.h b/sha1.h
@@ -10,9 +10,7 @@
 
 /* definitions extracted from sha1.c by Dave Dykstra, 4/22/97 */
 
-#ifndef _TCL
-#   include <tcl.h>
-#endif
+#include <tcl.h>
 
 /*
  * Windows needs to know which symbols to export.  Unix does not.
@@ -33,7 +31,7 @@ typedef struct {
 void SHA1Init	_ANSI_ARGS_((SHA1_CTX* context));
 void SHA1Update	_ANSI_ARGS_((SHA1_CTX* context, unsigned char* data,
 		 unsigned int len));
-void SHA1Final	_ANSI_ARGS_((unsigned char digest[20], SHA1_CTX* context));
+void SHA1Final	_ANSI_ARGS_((SHA1_CTX* context, unsigned char digest[20]));
 
 /*
  * Only the _Init function is exported.

diff --git a/tcl.m4 b/tcl.m4
@@ -1782,7 +1782,7 @@ AC_DEFUN(SC_MAKE_LIB, [
 	    ;;
 	*)
 	    MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(\[$]@_OBJECTS)"
-	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(\[$]@_OBJECTS) \${SHLIB_LDFLAGS} ${SHLIB_LD_LIBS}"
+	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(\[$]@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
 	    ;;
     esac
-Original file line number
+Diff line change
@@ Expand Up / @@ -1782,7 +1782,7 @@ AC_DEFUN(SC_MAKE_LIB, [ @@
     	    ;;
     	*)
     	    MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(\[$]@_OBJECTS)"
-    	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(\[$]@_OBJECTS) \${SHLIB_LDFLAGS} ${SHLIB_LD_LIBS}"
+    	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(\[$]@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
     	    ;;
         esac
@@ Expand Down @@