On Thu, 18 Jul 2002, Richard Levitte via RT wrote:
> The attached patch contains my suggestion. Would you mind looking
> it over and comment on it, perhaps even test it?
The patch (djgpp.last-patch) doesn't work as posted to RT, but I think
that I have modified it to what you intended. Also the modifications
for pod2mantest you made didn't quite work for DJGPP (ticket #131).
Attached is a patch that should take care of both tickets (#75 and
#131). I regenerated a patch against the 20 July 2002 snapshot. Please
see if this looks OK.
Doug
__
Doug Kaufman
Internet: [EMAIL PROTECTED]
--- Configure.orig 2002-07-18 00:02:20.000000000 -0800
+++ Configure 2002-07-21 00:07:28.000000000 -0800
@@ -1449,6 +1449,7 @@
my $make_targets = "";
$make_targets .= " links" if $symlink;
$make_targets .= " depend" if $depflags ne "" && $make_depend;
+ $make_targets .= " gentests" if $symlink;
(system $make_command.$make_targets) == 0 or exit $?
if $make_targets ne "";
if ( $perl =~ m@^/@) {
--- Makefile.org.orig 2002-07-19 09:02:18.000000000 -0800
+++ Makefile.org 2002-07-21 00:07:28.000000000 -0800
@@ -564,6 +564,10 @@
fi; \
done;
+gentests:
+ @(cd test && echo "generating dummy tests (if needed)..." && \
+ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)'
+INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'
+BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'
+RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'
+MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}'
+PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}'
+KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}'
+SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'
+TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
+
dclean:
rm -f *.bak
@for i in $(DIRS) ;\
--- test/dummytest.c.orig 2002-07-21 00:07:28.000000000 -0800
+++ test/dummytest.c 2002-07-21 00:07:28.000000000 -0800
@@ -0,0 +1,45 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <openssl/e_os2.h>
+#include <openssl/buffer.h>
+#include <openssl/crypto.h>
+
+int main(int argc, char *argv[])
+ {
+ char *p, *q, *program;
+
+ p = strrchr(argv[0], '/');
+ if (!p) p = strrchr(argv[0], '\\');
+#ifdef OPENSSL_SYS_VMS
+ if (!p) p = strrchr(argv[0], ']');
+ if (p) q = strrchr(p, '>');
+ if (q) p = q;
+ if (!p) p = strrchr(argv[0], ':');
+ q = 0;
+#endif
+ if (!p) p = argv[0];
+ if (p) q = strchr(p, '.');
+ if (p && !q) q = p + strlen(p);
+
+ if (!p)
+ program = BUF_strdup("(unknown)");
+ else
+ {
+ program = OPENSSL_malloc(strlen(p) + 1);
+ strcpy(program, p);
+ }
+
+ for(p = program; *p; p++)
+ if (islower(*p)) *p = toupper(*p);
+
+ q = strstr(program, "TEST");
+ if (q > p && q[-1] == '_') q--;
+ *q = '\0';
+
+ printf("No %s support\n", program + 1);
+
+ OPENSSL_free(program);
+ return(0);
+ }
--- test/Makefile.ssl.orig 2002-07-17 04:02:28.000000000 -0800
+++ test/Makefile.ssl 2002-07-21 00:13:18.000000000 -0800
@@ -102,6 +102,10 @@
links:
@@$(TOP)/util/point.sh Makefile.ssl Makefile
+generate: $(SRC)
+$(SRC):
+ @$(TOP)/util/point.sh dummytest.c $@
+
errors:
install:
--- util/pod2mantest.orig 2002-07-18 05:03:12.000000000 -0800
+++ util/pod2mantest 2002-07-21 13:04:32.000000000 -0800
@@ -14,7 +14,7 @@
if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
try_without_dir=false
# First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
-for dir in dummy:$PATH; do
+for dir in dummy${IFS}${PATH}; do
if [ "$try_without_dir" = true ]; then
# first iteration
pod2man=pod2man
