diff -Naur stunnel-4.05/configure stunnel-4.05-tmp/configure --- stunnel-4.05/configure 2003-12-28 20:55:49.000000000 +0000 +++ stunnel-4.05-tmp/configure 2005-04-22 10:14:07.000000000 +0100 @@ -8366,53 +8366,53 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5 -echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6 -if test "${ac_cv_file___dev_ptmx_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r ""/dev/ptmx""; then - ac_cv_file___dev_ptmx_=yes -else - ac_cv_file___dev_ptmx_=no -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5 -echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6 -if test $ac_cv_file___dev_ptmx_ = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_DEV_PTMX 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5 -echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6 -if test "${ac_cv_file___dev_ptc_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r ""/dev/ptc""; then - ac_cv_file___dev_ptc_=yes -else - ac_cv_file___dev_ptc_=no -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5 -echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6 -if test $ac_cv_file___dev_ptc_ = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_DEV_PTS_AND_PTC 1 -_ACEOF - -fi +##GRC##echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5 +##GRC##echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6 +##GRC##if test "${ac_cv_file___dev_ptmx_+set}" = set; then +##GRC## echo $ECHO_N "(cached) $ECHO_C" >&6 +##GRC##else +##GRC## test "$cross_compiling" = yes && +##GRC## { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +##GRC##echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +##GRC## { (exit 1); exit 1; }; } +##GRC##if test -r ""/dev/ptmx""; then +##GRC## ac_cv_file___dev_ptmx_=yes +##GRC##else +##GRC## ac_cv_file___dev_ptmx_=no +##GRC##fi +##GRC##fi +##GRC##echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5 +##GRC##echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6 +##GRC##if test $ac_cv_file___dev_ptmx_ = yes; then +##GRC## cat >>confdefs.h <<\_ACEOF +##GRC###define HAVE_DEV_PTMX 1 +##GRC##_ACEOF +##GRC## +##GRC##fi + +##GRC##echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5 +##GRC##echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6 +##GRC##if test "${ac_cv_file___dev_ptc_+set}" = set; then +##GRC## echo $ECHO_N "(cached) $ECHO_C" >&6 +##GRC##else +##GRC## test "$cross_compiling" = yes && +##GRC## { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +##GRC##echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +##GRC## { (exit 1); exit 1; }; } +##GRC##if test -r ""/dev/ptc""; then +##GRC## ac_cv_file___dev_ptc_=yes +##GRC##else +##GRC## ac_cv_file___dev_ptc_=no +##GRC##fi +##GRC##fi +##GRC##echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5 +##GRC##echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6 +##GRC##if test $ac_cv_file___dev_ptc_ = yes; then +##GRC## cat >>confdefs.h <<\_ACEOF +##GRC###define HAVE_DEV_PTS_AND_PTC 1 +##GRC##_ACEOF +##GRC## +##GRC##fi # AC_HEADER_DIRENT diff -Naur stunnel-4.05/openwrt-configure stunnel-4.05-tmp/openwrt-configure --- stunnel-4.05/openwrt-configure 1970-01-01 01:00:00.000000000 +0100 +++ stunnel-4.05-tmp/openwrt-configure 2005-04-22 10:38:02.000000000 +0100 @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Configure with options necessary for building stunnel for OpenWRT on WRT54G +# +# --with-ssl= +# +# This directory must contain three further directories: +# include/openssl - the header files for the version of openssl on the target OpenWRT host +# lib - the openssl shared libraries for the target OpenWRT host +# bin - an openssl executable for the *build* system (not the target OpenWRT host) +# +# --with-random=/dev/random +# +# As this is a cross-compilation, the configure script needs to be told the random device to be used on the WRT54G +# +# --prefix=/usr +# --sysconfdir=/etc +# --sharedstatedir=/var +# --localstatedir=/var +# +# Directories to use on the WRT54G. Note that /var == /tmp in OpenWRT. +# +# --host=mipsel +# +# cross-compilation required +# +# CC= +# CFLAGS="-I -Os -mips2" +# LIBS=-L +# +# Location of cross-compiler, flags, libraries and tools from the OpenWRT buildroot +# +GRC_TOP=/xl-linux/home/wrt54g/wrt54g.old + +./configure \ + --with-ssl=$GRC_TOP/packages/libs \ + --with-random=/dev/random \ + --prefix=/usr --sysconfdir=/etc --sharedstatedir=/var --localstatedir=/var \ + --host=mipsel \ + CC=$GRC_TOP/buildroot/build_mipsel/staging_dir/bin/mipsel-linux-gcc \ + CFLAGS="-I$GRC_TOP/buildroot/build_mipsel/staging_dir/mipsel-linux-uclibc/include -Os -mips2" \ + LIBS="-L$GRC_TOP/buildroot/build_mipsel/staging_dir/lib/" \ + NM=$GRC_TOP/buildroot/build_mipsel/staging_dir/bin/mipsel-linux-nm \ + LD=$GRC_TOP/buildroot/build_mipsel/staging_dir/bin/mipsel-linux-ld \ + STRIP=$GRC_TOP/buildroot/build_mipsel/staging_dir/bin/mipsel-linux-strip \ + RANLIB=$GRC_TOP/buildroot/build_mipsel/staging_dir/bin/mipsel-linux-ranlib \ + "$@" diff -Naur stunnel-4.05/configure.ac stunnel-4.05-tmp/configure.ac --- stunnel-4.05/configure.ac 2003-12-28 20:47:49.000000000 +0000 +++ stunnel-4.05-tmp/configure.ac 2005-04-22 10:14:07.000000000 +0100 @@ -176,8 +176,8 @@ [AC_MSG_RESULT([no])]; LIBS="$saved_LIBS") dnl Check PTY device files. -AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX)) -AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC)) +dnl **GRC - for WRT54G** AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX)) +dnl **GRC - for WRT54G** AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC)) dnl Checks for header files. # AC_HEADER_DIRENT