mirror of https://github.com/wolfSSL/wolfssh.git
Configuration tweaks
1. Replaced all the echo statements with AS_ECHO. 2. Moved the jobserver option up with debug and pthreads. 3. Changed label for enable-term to disable-term since default is enabled. 4. Removed the forced make clean.pull/254/head
parent
53da5b837b
commit
9e33356e55
48
configure.ac
48
configure.ac
|
@ -77,6 +77,8 @@ AX_PTHREAD([
|
|||
AS_CASE([$PTHREAD_CFLAGS],[-Qunused-arguments*],[PTHREAD_CFLAGS="-Xcompiler $PTHREAD_CFLAGS"])
|
||||
AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"])
|
||||
|
||||
AX_AM_JOBSERVER([yes])
|
||||
|
||||
# Inline Build
|
||||
AC_ARG_ENABLE([inline],
|
||||
[AS_HELP_STRING([--disable-inline],[Disable inline functions (default: enabled)])],
|
||||
|
@ -109,7 +111,7 @@ AC_ARG_ENABLE([fwd],
|
|||
|
||||
# pseudo-terminal
|
||||
AC_ARG_ENABLE([term],
|
||||
[AS_HELP_STRING([--enable-term],[Enable pseudo-terminal support (default: enabled)])],
|
||||
[AS_HELP_STRING([--disable-term],[Enable pseudo-terminal support (default: enabled)])],
|
||||
[ENABLED_PTERM=$enableval],[ENABLED_PTERM=yes])
|
||||
|
||||
# Enable All
|
||||
|
@ -169,32 +171,26 @@ AC_SUBST([AM_LDFLAGS])
|
|||
AC_CONFIG_FILES([Makefile wolfssh/version.h])
|
||||
|
||||
AX_CREATE_GENERIC_CONFIG
|
||||
AX_AM_JOBSERVER([yes])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
# force make clean
|
||||
echo "---"
|
||||
echo "Running make clean..."
|
||||
make clean >/dev/null 2>&1
|
||||
|
||||
# output config summary
|
||||
echo "---"
|
||||
echo "Configuration summary for $PACKAGE_NAME version $VERSION"
|
||||
echo ""
|
||||
echo " * Installation prefix: $prefix"
|
||||
echo " * System type: $host_vendor-$host_os"
|
||||
echo " * Host CPU: $host_cpu"
|
||||
echo " * C Compiler: $CC"
|
||||
echo " * C Flags: $CFLAGS"
|
||||
echo " * CPP Flags: $CPPFLAGS"
|
||||
echo " * Linker Flags: $LDFLAGS"
|
||||
echo
|
||||
echo " Features"
|
||||
echo " * Inline Code: $ENABLED_INLINE"
|
||||
echo " * keygen: $ENABLED_KEYGEN"
|
||||
echo " * psuedo-terminal: $ENABLED_PTERM"
|
||||
echo " * scp: $ENABLED_SCP"
|
||||
echo " * sftp: $ENABLED_SFTP"
|
||||
echo " * TCP/IP Forwarding: $ENABLED_FWD"
|
||||
echo " * Examples: $ENABLED_EXAMPLES"
|
||||
AS_ECHO(["---"])
|
||||
AS_ECHO(["Configuration summary for $PACKAGE_NAME version $VERSION"])
|
||||
AS_ECHO
|
||||
AS_ECHO([" * Installation prefix: $prefix"])
|
||||
AS_ECHO([" * System type: $host_vendor-$host_os"])
|
||||
AS_ECHO([" * Host CPU: $host_cpu"])
|
||||
AS_ECHO([" * C Compiler: $CC"])
|
||||
AS_ECHO([" * C Flags: $CFLAGS"])
|
||||
AS_ECHO([" * CPP Flags: $CPPFLAGS"])
|
||||
AS_ECHO([" * Linker Flags: $LDFLAGS"])
|
||||
AS_ECHO
|
||||
AS_ECHO([" Features"])
|
||||
AS_ECHO([" * Inline Code: $ENABLED_INLINE"])
|
||||
AS_ECHO([" * keygen: $ENABLED_KEYGEN"])
|
||||
AS_ECHO([" * psuedo-terminal: $ENABLED_PTERM"])
|
||||
AS_ECHO([" * scp: $ENABLED_SCP"])
|
||||
AS_ECHO([" * sftp: $ENABLED_SFTP"])
|
||||
AS_ECHO([" * TCP/IP Forwarding: $ENABLED_FWD"])
|
||||
AS_ECHO([" * Examples: $ENABLED_EXAMPLES"])
|
||||
|
|
Loading…
Reference in New Issue