Author: rfm
Date: Mon Nov 17 11:43:36 2014
New Revision: 38178
URL: http://svn.gna.org/viewcvs/gnustep?rev=38178&view=rev
Log:
tweak
Modified:
libs/webservices/trunk/configure
libs/webservices/trunk/configure.ac
Modified: libs/webservices/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webservices/trunk/configure?rev=38178&r1=38177&r2=38178&view=diff
==============================================================================
--- libs/webservices/trunk/configure (original)
+++ libs/webservices/trunk/configure Mon Nov 17 11:43:36 2014
@@ -1867,10 +1867,11 @@
{ $as_echo "$as_me:$LINENO: checking for NETTLE" >&5
$as_echo_n "checking for NETTLE... " >&6; }
-if test -n "$NETTLE_CFLAGS"; then
- pkg_cv_NETTLE_CFLAGS="$NETTLE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$NETTLE_CFLAGS"; then
+ pkg_cv_NETTLE_CFLAGS="$NETTLE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"nettle\"") >&5
($PKG_CONFIG --exists --print-errors "nettle") 2>&5
ac_status=$?
@@ -1880,13 +1881,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
-fi
-if test -n "$NETTLE_LIBS"; then
- pkg_cv_NETTLE_LIBS="$NETTLE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$NETTLE_LIBS"; then
+ pkg_cv_NETTLE_LIBS="$NETTLE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"nettle\"") >&5
($PKG_CONFIG --exists --print-errors "nettle") 2>&5
ac_status=$?
@@ -1896,8 +1899,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -1910,9 +1914,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NETTLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"nettle" 2>&1`
+ NETTLE_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "nettle"`
else
- NETTLE_PKG_ERRORS=`$PKG_CONFIG --print-errors "nettle" 2>&1`
+ NETTLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "nettle"`
fi
# Put the nasty error message in config.log where it belongs
echo "$NETTLE_PKG_ERRORS" >&5
@@ -2994,10 +2998,11 @@
{ $as_echo "$as_me:$LINENO: checking for GNUTLS" >&5
$as_echo_n "checking for GNUTLS... " >&6; }
-if test -n "$GNUTLS_CFLAGS"; then
- pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GNUTLS_CFLAGS"; then
+ pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"gnutls\"") >&5
($PKG_CONFIG --exists --print-errors "gnutls") 2>&5
ac_status=$?
@@ -3007,13 +3012,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
-fi
-if test -n "$GNUTLS_LIBS"; then
- pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GNUTLS_LIBS"; then
+ pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"gnutls\"") >&5
($PKG_CONFIG --exists --print-errors "gnutls") 2>&5
ac_status=$?
@@ -3023,8 +3030,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -3037,9 +3045,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gnutls" 2>&1`
+ GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "gnutls"`
else
- GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls" 2>&1`
+ GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "gnutls"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNUTLS_PKG_ERRORS" >&5
@@ -3178,7 +3186,7 @@
$as_echo "$as_me: WARNING: \"GnuTLS not available (or too old); advanced
cryptographic functions are disabled.\"" >&2;}
fi
-ac_config_files="$ac_config_files config.make config.h GWSHash.h
WSSUsernameToken.h"
+ac_config_files="$ac_config_files config.make config.h GWSHash.h"
cat >confcache <<\_ACEOF
@@ -3792,7 +3800,6 @@
"config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;;
"config.h") CONFIG_FILES="$CONFIG_FILES config.h" ;;
"GWSHash.h") CONFIG_FILES="$CONFIG_FILES GWSHash.h" ;;
- "WSSUsernameToken.h") CONFIG_FILES="$CONFIG_FILES WSSUsernameToken.h" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target"
>&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Modified: libs/webservices/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webservices/trunk/configure.ac?rev=38178&r1=38177&r2=38178&view=diff
==============================================================================
--- libs/webservices/trunk/configure.ac (original)
+++ libs/webservices/trunk/configure.ac Mon Nov 17 11:43:36 2014
@@ -58,6 +58,6 @@
AC_MSG_WARN("GnuTLS not available (or too old); advanced cryptographic
functions are disabled.")
fi
-AC_CONFIG_FILES([config.make config.h GWSHash.h WSSUsernameToken.h])
+AC_CONFIG_FILES([config.make config.h GWSHash.h])
AC_OUTPUT
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
