mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
if neither the new pkg-config nor the old gnustls-config system is found ... try to guess what flags might be used for gnutls
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36468 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
5ad8f0ae20
commit
fec7f6689d
4 changed files with 87 additions and 62 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2013-04-05 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* config/pathtls.m4: Try to guess gnutls flags if no config found
|
||||
* configure: regenerate
|
||||
* Tools/AGSHtml.m: Fix error when title index missing.
|
||||
|
||||
2013-04-03 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSSocketPort.m: Improve/simplify invalidation.
|
||||
|
|
|
|||
115
Tools/AGSHtml.m
115
Tools/AGSHtml.m
|
|
@ -354,72 +354,75 @@ static NSString *mainFont = nil;
|
|||
dict = [refs objectForKey: type];
|
||||
}
|
||||
|
||||
if ([dict count] > 1 && [type isEqual: @"title"] == YES)
|
||||
if ([type isEqual: @"title"] == YES)
|
||||
{
|
||||
if (!isBareStyle)
|
||||
if ([dict count] > 1)
|
||||
{
|
||||
[buf appendString: indent];
|
||||
[buf appendFormat: @"<b>%@ Index</b>\n", title];
|
||||
[buf appendString: indent];
|
||||
[buf appendString: @"<ul>\n"];
|
||||
[self incIndent];
|
||||
}
|
||||
|
||||
a = [dict allKeys];
|
||||
a = [a sortedArrayUsingSelector: @selector(compare:)];
|
||||
c = [a count];
|
||||
|
||||
for (i = 0; i < c; i++)
|
||||
{
|
||||
NSString *ref = [a objectAtIndex: i];
|
||||
NSString *text = [dict objectForKey: ref];
|
||||
NSString *file = ref;
|
||||
|
||||
ref = [ref stringByReplacingString: @":" withString: @"$"];
|
||||
if ([file isEqual: base] == YES)
|
||||
{
|
||||
continue; // Don't list current file.
|
||||
}
|
||||
|
||||
[buf appendString: indent];
|
||||
if (!isBareStyle)
|
||||
{
|
||||
[buf appendString: @"<li>"];
|
||||
[buf appendString: indent];
|
||||
[buf appendFormat: @"<b>%@ Index</b>\n", title];
|
||||
[buf appendString: indent];
|
||||
[buf appendString: @"<ul>\n"];
|
||||
[self incIndent];
|
||||
}
|
||||
[buf appendString: @"<a rel=\"gsdoc\" "];
|
||||
if (target != nil)
|
||||
|
||||
a = [dict allKeys];
|
||||
a = [a sortedArrayUsingSelector: @selector(compare:)];
|
||||
c = [a count];
|
||||
|
||||
for (i = 0; i < c; i++)
|
||||
{
|
||||
[buf appendFormat: @"target=\"%@\" ", target];
|
||||
}
|
||||
if (([type isEqual: @"protocol"] == YES)
|
||||
&& ([text hasPrefix: @"("] == NO))
|
||||
{
|
||||
// it's an informal protocol, detected earlier as an
|
||||
// unimplemented category of NSObject; make proper link
|
||||
[buf appendFormat: @"href=\"%@.html#%@$NSObject%@\">(%@)</a>",
|
||||
file, @"category", ref, text];
|
||||
}
|
||||
else
|
||||
{
|
||||
[buf appendFormat: @"href=\"%@.html#%@$%@\">%@</a>",
|
||||
file, type, ref, text];
|
||||
NSString *ref = [a objectAtIndex: i];
|
||||
NSString *text = [dict objectForKey: ref];
|
||||
NSString *file = ref;
|
||||
|
||||
ref = [ref stringByReplacingString: @":" withString: @"$"];
|
||||
if ([file isEqual: base] == YES)
|
||||
{
|
||||
continue; // Don't list current file.
|
||||
}
|
||||
|
||||
[buf appendString: indent];
|
||||
if (!isBareStyle)
|
||||
{
|
||||
[buf appendString: @"<li>"];
|
||||
}
|
||||
[buf appendString: @"<a rel=\"gsdoc\" "];
|
||||
if (target != nil)
|
||||
{
|
||||
[buf appendFormat: @"target=\"%@\" ", target];
|
||||
}
|
||||
if (([type isEqual: @"protocol"] == YES)
|
||||
&& ([text hasPrefix: @"("] == NO))
|
||||
{
|
||||
// it's an informal protocol, detected earlier as an
|
||||
// unimplemented category of NSObject; make proper link
|
||||
[buf appendFormat: @"href=\"%@.html#%@$NSObject%@\">(%@)</a>",
|
||||
file, @"category", ref, text];
|
||||
}
|
||||
else
|
||||
{
|
||||
[buf appendFormat: @"href=\"%@.html#%@$%@\">%@</a>",
|
||||
file, type, ref, text];
|
||||
}
|
||||
if (!isBareStyle)
|
||||
{
|
||||
[buf appendString: @"</li>"];
|
||||
}
|
||||
else
|
||||
{
|
||||
[buf appendString: @"<br/>"];
|
||||
}
|
||||
[buf appendString: @"\n"];
|
||||
}
|
||||
|
||||
if (!isBareStyle)
|
||||
{
|
||||
[buf appendString: @"</li>"];
|
||||
[self decIndent];
|
||||
[buf appendString: indent];
|
||||
[buf appendString: @"</ul>\n"];
|
||||
}
|
||||
else
|
||||
{
|
||||
[buf appendString: @"<br/>"];
|
||||
}
|
||||
[buf appendString: @"\n"];
|
||||
}
|
||||
|
||||
if (!isBareStyle)
|
||||
{
|
||||
[self decIndent];
|
||||
[buf appendString: indent];
|
||||
[buf appendString: @"</ul>\n"];
|
||||
}
|
||||
}
|
||||
else if ([dict count] > 0)
|
||||
|
|
|
|||
|
|
@ -18,14 +18,22 @@ AC_ARG_ENABLE(tlstest,
|
|||
TLS_CONFIG=$tls_config_prefix/bin/libgnutls-config
|
||||
fi
|
||||
fi
|
||||
if test ! -x "$TLS_CONFIG" ; then
|
||||
unset TLS_CONFIG
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(TLS_CONFIG, libgnutls-config, no)
|
||||
min_tls_version=ifelse([$1], ,2.0.0, [$1])
|
||||
AC_MSG_CHECKING(for libgnutls - version >= $min_tls_version)
|
||||
no_tls=""
|
||||
if test "$TLS_CONFIG" = "no" ; then
|
||||
TLS_CFLAGS="-I/usr/include"
|
||||
TLS_LIBS="-L/usr/lib -lgnutls -lgcrypt"
|
||||
if test x$tls_config_prefix != x ; then
|
||||
TLS_CFLAGS="-I$tls_config_prefix/include"
|
||||
TLS_LIBS="-L$tls_config_prefix/lib -lgnutls -lgcrypt"
|
||||
else
|
||||
TLS_CFLAGS="-I/usr/include"
|
||||
TLS_LIBS="-L/usr/lib -lgnutls -lgcrypt"
|
||||
fi
|
||||
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
|
|
@ -118,7 +126,7 @@ main()
|
|||
AC_MSG_RESULT(no)
|
||||
if test "$TLS_CONFIG" = "no" ; then
|
||||
echo "*** The libgnutls-config script installed by libgnutls could not be found"
|
||||
echo "*** If libtgnuls was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** If libtgnuls-config was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path."
|
||||
else
|
||||
if test -f conf.tlstest ; then
|
||||
|
|
|
|||
14
configure
vendored
14
configure
vendored
|
|
@ -24857,6 +24857,9 @@ fi
|
|||
TLS_CONFIG=$tls_config_prefix/bin/libgnutls-config
|
||||
fi
|
||||
fi
|
||||
if test ! -x "$TLS_CONFIG" ; then
|
||||
unset TLS_CONFIG
|
||||
fi
|
||||
|
||||
# Extract the first word of "libgnutls-config", so it can be a program name with args.
|
||||
set dummy libgnutls-config; ac_word=$2
|
||||
|
|
@ -24904,8 +24907,13 @@ fi
|
|||
$as_echo_n "checking for libgnutls - version >= $min_tls_version... " >&6; }
|
||||
no_tls=""
|
||||
if test "$TLS_CONFIG" = "no" ; then
|
||||
TLS_CFLAGS="-I/usr/include"
|
||||
TLS_LIBS="-L/usr/lib -lgnutls -lgcrypt"
|
||||
if test x$tls_config_prefix != x ; then
|
||||
TLS_CFLAGS="-I$tls_config_prefix/include"
|
||||
TLS_LIBS="-L$tls_config_prefix/lib -lgnutls -lgcrypt"
|
||||
else
|
||||
TLS_CFLAGS="-I/usr/include"
|
||||
TLS_LIBS="-L/usr/lib -lgnutls -lgcrypt"
|
||||
fi
|
||||
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
|
|
@ -25086,7 +25094,7 @@ $as_echo "yes" >&6; }
|
|||
$as_echo "no" >&6; }
|
||||
if test "$TLS_CONFIG" = "no" ; then
|
||||
echo "*** The libgnutls-config script installed by libgnutls could not be found"
|
||||
echo "*** If libtgnuls was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** If libtgnuls-config was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path."
|
||||
else
|
||||
if test -f conf.tlstest ; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue