projects / packages / cipe.git / blame
| Commit | Line | Data |
|---|---|---|
| 7c012c4a SZ |
1 | diff -Naur cipe-1.5.2/configure.in cipe-1.5.2-p/configure.in |
| 2 | --- cipe-1.5.2/configure.in Tue May 1 23:23:38 2001 | |
| 3 | +++ cipe-1.5.2-p/configure.in Tue Nov 6 17:58:33 2001 | |
| 4 | @@ -13,8 +13,6 @@ | |
| 5 | dnl | |
| 6 | AC_PREREQ(2.13) | |
| 7 | AC_INIT(cipe/ciped.c) | |
| 8 | -AC_CONFIG_HEADER($BUILD/config.h:conf/config.h.in pkcipe/config.h) | |
| 9 | -dnl $BUILD is set below - this works for autoconf 2.13, somewhat undocumented | |
| 10 | AC_SUBST(VERSION) | |
| 11 | VERSION=1.5.2 | |
| 12 | AC_SUBST(PVERSION) | |
| 13 | @@ -351,6 +349,8 @@ | |
| 14 | else | |
| 15 | BUILD=$KVERS-$ARCH-$verl$crypt$name | |
| 16 | fi | |
| 17 | + | |
| 18 | +AC_CONFIG_HEADER($BUILD/config.h:conf/config.h.in pkcipe/config.h) | |
| 19 | ||
| 20 | AC_SUBST(BUILD_PKCIPE) | |
| 21 | set `echo $VERSION | tr . ' '` | |
| 22 | --- cipe-1.5.2/configure.in Wed Nov 7 16:00:26 2001 | |
| 23 | +++ cipe-1.5.2-p/configure.in Wed Nov 7 15:59:28 2001 | |
| 24 | @@ -136,23 +136,10 @@ | |
| 25 | fi | |
| 26 | fi | |
| 27 | ||
| 28 | -AC_MSG_CHECKING(for SMP) | |
| 29 | -smp=0 | |
| 30 | -case "$KVERS" in | |
| 31 | -2.[[01]].*) | |
| 32 | - AX_EGREP([^ *SMP *= *1], $KSRC/Makefile, smp=1) | |
| 33 | - ;; | |
| 34 | -*) | |
| 35 | - AC_EGREP_CPP(yes, [ | |
| 36 | - #include <linux/autoconf.h> | |
| 37 | - #ifdef CONFIG_SMP | |
| 38 | - yes | |
| 39 | - #endif | |
| 40 | - ], smp=1) | |
| 41 | - ;; | |
| 42 | -esac | |
| 43 | +AC_ARG_ENABLE(smp, | |
| 44 | +[ --enable-smp Build CIPE for SMP architecture], | |
| 45 | +smp=1, smp=0) | |
| 46 | test "$smp" = 1 && AC_DEFINE(__SMP__) | |
| 47 | -AX_MSG_RESULT_YN($smp) | |
| 48 | ||
| 49 | AC_SUBST(KCC) | |
| 50 | CPPFLAGS="$oldcppflags" | |
| a63317d5 SZ |
51 | diff -Naur cipe-1.5.2/configure.in cipe-1.5.2-p/configure.in |
| 52 | --- cipe-1.5.2/configure.in Thu Nov 22 15:55:03 2001 | |
| 53 | +++ cipe-1.5.2-p/configure.in Thu Nov 22 15:56:05 2001 | |
| 54 | @@ -65,28 +65,6 @@ | |
| 55 | fi | |
| 56 | AC_MSG_RESULT($KINC) | |
| 57 | ||
| 58 | -AC_MSG_CHECKING(for kernel compile parameters) | |
| 59 | -if test -z "$KSRC" -o ! -f "$KSRC/Makefile" ; then | |
| 60 | - AC_MSG_WARN(no Makefile - using default flags) | |
| 61 | -else | |
| 62 | - cp $KSRC/Makefile conftest.make | |
| 63 | - echo -e "conftest.CC:" >>conftest.make | |
| 64 | - echo -e "\t@echo \$(CC)" >>conftest.make | |
| 65 | - echo -e "conftest.CFLAGS:" >>conftest.make | |
| 66 | - echo -e "\t@echo \$(CFLAGS) \$(MODFLAGS)" >>conftest.make | |
| 67 | - here=`pwd` | |
| 68 | - NKCC=`cd $KSRC; make -f $here/conftest.make conftest.CC` | |
| 69 | - NKCFLAGS=`cd $KSRC; make -f $here/conftest.make conftest.CFLAGS` | |
| 70 | - dnl some sanity checking | |
| 71 | - echo "$NKCC $NKCFLAGS" | grep -qse '-I[[^ ]]*/include' || NKCC="" | |
| 72 | - if test -z "$NKCC" ; then | |
| 73 | - AC_MSG_WARN(not found - using default flags) | |
| 74 | - else | |
| 75 | - AC_MSG_RESULT($NKCC $NKCFLAGS) | |
| 76 | - fi | |
| 77 | - rm -f conftest.make | |
| 78 | -fi | |
| 79 | - | |
| 80 | dnl cancel -O arguments set by autoconf | |
| 81 | if ! test "$ac_test_CFLAGS" = set; then | |
| 82 | CFLAGS=`echo $CFLAGS | sed 's,-O[[0-9]]*,,g'` | |
| 96e0d817 JK |
83 | diff -durN cipe-1.5.2.orig/configure.in cipe-1.5.2/configure.in |
| 84 | --- cipe-1.5.2.orig/configure.in Sat Jul 20 16:29:06 2002 | |
| 85 | +++ cipe-1.5.2/configure.in Sat Jul 20 16:29:28 2002 | |
| 86 | @@ -284,7 +284,7 @@ | |
| 87 | BUILD_PKCIPE="" | |
| 88 | fi | |
| 89 | SSLBIN=`dirname $SSLLIBS`/bin | |
| 90 | -AC_PATH_PROG(OPENSSL, openssl, no, "${SSLBIN}:${PATH}") | |
| 91 | +AC_PATH_PROG(OPENSSL, openssl, [/usr/bin/openssl], [${SSLBIN}:${PATH}]) | |
| 92 | test "$OPENSSL" = "no" && AC_MSG_ERROR(openssl binary not found) | |
| 93 | AC_MSG_CHECKING(OpenSSL version) | |
| 94 | set `$OPENSSL version` |