feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

switch --enable-noFilesystem to --enable-filesystem / --disable-filesystem to match others

Browse Source
This commit is contained in:
toddouska
2013-03-13 12:14:05 -07:00
parent 7cabbb4b54
commit 975ffe693b
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@@ -891,16 +891,23 @@ then
fi fi
# No Filesystem Build # Filesystem Build
AC_ARG_ENABLE([noFilesystem], AC_ARG_ENABLE([filesystem],
[ --enable-noFilesystem Enable No Filesystem (default: disabled)], [ --enable-filesystem Enable Filesystem support (default: disabled)],
[ ENABLED_NOFILESYSTEM=$enableval ], [ ENABLED_FILESYSTEM=$enableval ],
[ ENABLED_NOFILESYSTEM=no ] [ ENABLED_FILESYSTEM=yes ]
) )
if test "$ENABLED_NOFILESYSTEM" = "yes" if test "$ENABLED_FILESYSTEM" = "no"
then then
AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM" AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM"
else
# turn off filesystem if leanpsk on
if test "$ENABLED_LEANPSK" = "yes"
then
AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM"
ENABLED_FILESYSTEM=no
fi
fi fi
@@ -1073,7 +1080,7 @@ AC_ARG_ENABLE([examples],
) )
AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"])
AS_IF([test "x$ENABLED_NOFILESYSTEM" = "xyes"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_FILESYSTEM" = "xno"], [ENABLED_EXAMPLES="no"])
# certs still have sha signatures for now # certs still have sha signatures for now
AS_IF([test "x$ENABLED_SHA" = "xno"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_SHA" = "xno"], [ENABLED_EXAMPLES="no"])
AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"]) AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"])
@@ -1222,7 +1229,8 @@ echo " * VCS checkout: $ac_cv_vcs_checkout"
echo echo
echo " Features " echo " Features "
echo " * Single threaded: $ENABLED_SINGLETHREADED" echo " * Single threaded: $ENABLED_SINGLETHREADED"
echo " * Enable extra OpenSSL API: $ENABLED_OPENSSLEXTRA" echo " * Filesystem: $ENABLED_FILESYSTEM"
echo " * OpenSSL Extra API: $ENABLED_OPENSSLEXTRA"
echo " * fastmath: $ENABLED_FASTMATH" echo " * fastmath: $ENABLED_FASTMATH"
echo " * sniffer: $ENABLED_SNIFFER" echo " * sniffer: $ENABLED_SNIFFER"
echo " * ARC4: $ENABLED_ARC4" echo " * ARC4: $ENABLED_ARC4"

2
examples/echoclient/echoclient.c
View File

@@ -98,7 +98,7 @@ void echoclient_test(void* args)
err_sys("can't load ca file, Please run from CyaSSL home dir"); err_sys("can't load ca file, Please run from CyaSSL home dir");
#endif #endif
#elif !defined(NO_CERTS) #elif !defined(NO_CERTS)
if (!doLeanPSK) if (!doPSK)
load_buffer(ctx, caCert, CYASSL_CA); load_buffer(ctx, caCert, CYASSL_CA);
#endif #endif