gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-16 00:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2002-09-22 Mirko Viviani <mirko.viviani@rccr.cremona.it>

Browse source 
* Makefile.postamble: install gsweb.make

	* GSWeb.framework/GSWDefaultAdaptor.m: added config.h

	* GSWeb.framework/Makefile.preamble.in: new file.
	* GSWeb.framework/Makefile.preamble: removed.
	* gsweb.make.in: new file.

	* configure.ac: new file.
	* config/pathxml.m4: new file.
	* gsweb.make.in: new file.
	* config.h.in: new file.

	* GSWeb.framework/GNUmakefile (GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES):
	include gsweb.make

	* GSWeb.framework/GSWTemplateParserXML.h|.m: include libxml includes
	from libxml/ dir.

	* GSWeb.framework/*.m: replaced all occurrencies of stringWithout*: and
	remove*: with the new methods.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@14509 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2002-09-22 14:27:04 +00:00
parent 9dee3aa072
commit f975683fc8
25 changed files with 3705 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ChangeLog
View file

@ -1,3 +1,27 @@
2002-09-22 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* Makefile.postamble: install gsweb.make
* GSWeb.framework/GSWDefaultAdaptor.m: added config.h
* GSWeb.framework/Makefile.preamble.in: new file.
* GSWeb.framework/Makefile.preamble: removed.
* gsweb.make.in: new file.
* configure.ac: new file.
* config/pathxml.m4: new file.
* gsweb.make.in: new file.
* config.h.in: new file.
* GSWeb.framework/GNUmakefile (GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES):
include gsweb.make
* GSWeb.framework/GSWTemplateParserXML.h|.m: include libxml includes
from libxml/ dir.
* GSWeb.framework/*.m: replaced all occurrencies of stringWithout*: and
remove*: with the new methods.
2002-09-15 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWElementIDString.m
o Applied David Ayers <d.ayers@inode.at> patch

1
GSWeb.framework/GNUmakefile
View file

@ -26,6 +26,7 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gsweb.make
include $(GNUSTEP_MAKEFILES)/common.make
include ../Version

8
GSWeb.framework/GSWApplication.m
View file

@ -378,11 +378,11 @@ int GSWApplicationMainReal(NSString* applicationClassName,
debugOpt=nil;
opt=[args objectAtIndex:i];
if ([opt hasPrefix:@"--GSWebDebug="])
debugOpt=[opt stringWithoutPrefix:@"--GSWebDebug="];
debugOpt=[opt stringByDeletingPrefix:@"--GSWebDebug="];
else if ([opt hasPrefix:@"-GSWebDebug="])
debugOpt=[opt stringWithoutPrefix:@"-GSWebDebug="];
debugOpt=[opt stringByDeletingPrefix:@"-GSWebDebug="];
else if ([opt hasPrefix:@"GSWebDebug="])
debugOpt=[opt stringWithoutPrefix:@"GSWebDebug="];
debugOpt=[opt stringByDeletingPrefix:@"GSWebDebug="];
if (debugOpt)
GSWApplicationSetDebugSetOption(debugOpt);
};
@ -921,7 +921,7 @@ selfLockn,
NSDebugMLLog(@"application",@"processName:%@",processName);
processName=[processName lastPathComponent];
if ([processName hasSuffix:GSWApplicationPSuffix[GSWebNamingConv]])
name=[processName stringWithoutSuffix:GSWApplicationPSuffix[GSWebNamingConv]];
name=[processName stringByDeletingSuffix:GSWApplicationPSuffix[GSWebNamingConv]];
else
name=processName;
NSDebugMLLog(@"application",@"_name:%@ %p",name,name);

16
GSWeb.framework/GSWAssociation.m
View file

@ -278,7 +278,7 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
{
if ([trimmedString hasSuffix:@"\""])
{
assoc=[self associationWithValue:[[trimmedString stringWithoutPrefix:@"\""] stringWithoutSuffix:@"\""]];
assoc=[self associationWithValue:[[trimmedString stringByDeletingPrefix:@"\""] stringByDeletingSuffix:@"\""]];
NSDebugMLLog(@"associations",@"assoc=[%@]",assoc);
}
else
@ -291,7 +291,7 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
{
if ([trimmedString hasSuffix:@"\'"])
{
assoc=[self associationWithValue:[[trimmedString stringWithoutPrefix:@"\'"] stringWithoutSuffix:@"\'"]];
assoc=[self associationWithValue:[[trimmedString stringByDeletingPrefix:@"\'"] stringByDeletingSuffix:@"\'"]];
NSDebugMLLog(@"associations",@"assoc=[%@]",assoc);
}
else
@ -302,7 +302,7 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
}
else if ([trimmedString hasPrefix:@"#"])
{
NSString* numberString=[trimmedString stringWithoutPrefix:@"#"];
NSString* numberString=[trimmedString stringByDeletingPrefix:@"#"];
//char* cString=[numberString lossyCString];//TODO
char* cString=[numberString cString];//TODO
char* endPtr=NULL;
@ -686,14 +686,14 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
NSDebugMLLog(@"associations",@"part class=%@",NSStringFromClass([part class]));
if ([part hasPrefix:@"\""])
{
part=[part stringWithoutPrefix:@"\""];
part=[part stringByDeletingPrefix:@"\""];
while([keys count]>0)
{
id tmpPart=[keys objectAtIndex:0];
[keys removeObjectAtIndex:0];
if ([tmpPart hasSuffix:@"\""])
{
tmpPart=[tmpPart stringWithoutSuffix:@"\""];
tmpPart=[tmpPart stringByDeletingSuffix:@"\""];
part=[part stringByAppendingFormat:@".%@",tmpPart];
break;
}
@ -880,14 +880,14 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
NSDebugMLLog(@"associations",@"part class=%@",NSStringFromClass([part class]));
if ([part hasPrefix:@"\""])
{
part=[part stringWithoutPrefix:@"\""];
part=[part stringByDeletingPrefix:@"\""];
while([keys count]>0)
{
id tmpPart=[keys objectAtIndex:0];
[keys removeObjectAtIndex:0];
if ([tmpPart hasSuffix:@"\""])
{
tmpPart=[tmpPart stringWithoutSuffix:@"\""];
tmpPart=[tmpPart stringByDeletingSuffix:@"\""];
part=[part stringByAppendingFormat:@".%@",tmpPart];
break;
}
@ -1073,7 +1073,7 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
[removeFrom removeObjectForKey:key];
value=[self objectForKey:key];
NSDebugMLLog(@"associations",@"value=%@",value);
varKey=[key stringWithoutPrefix:prefix];
varKey=[key stringByDeletingPrefix:prefix];
NSDebugMLLog(@"associations",@"varKey=%@",varKey);
varKeyAssociation=[GSWAssociation associationWithKeyPath:varKey];
NSDebugMLLog(@"associations",@"varKeyAssociation=%@",varKeyAssociation);

4
GSWeb.framework/GSWBindingNameAssociation.m
View file

@ -48,11 +48,11 @@ static char rcsId[] = "$Id$";
{
if (!WOStrictFlag && [aKeyPath hasPrefix:@"^"])
{
ASSIGNCOPY(_parentBindingName,[[keys objectAtIndex:0] stringWithoutPrefix:@"^"]);
ASSIGNCOPY(_parentBindingName,[[keys objectAtIndex:0] stringByDeletingPrefix:@"^"]);
}
else if (!WOStrictFlag && [aKeyPath hasPrefix:@"~"])
{
ASSIGNCOPY(_parentBindingName,[[keys objectAtIndex:0] stringWithoutPrefix:@"~"]);
ASSIGNCOPY(_parentBindingName,[[keys objectAtIndex:0] stringByDeletingPrefix:@"~"]);
_isNonMandatory=YES;
};
if ([keys count]>1)

2
GSWeb.framework/GSWDefaultAdaptor.m
View file

@ -33,6 +33,8 @@ static char rcsId[] = "$Id$";
#include <GSWeb/GSWeb.h>
//#include <gnustep/base/UnixFileHandle.h>
#include <gnustep/base/GSFileHandle.h>
#include "config.h"
#if HAVE_LIBWRAP
#include <tcpd.h>
#include <syslog.h>

6
GSWeb.framework/GSWDynamicURLString.m
View file

@ -510,7 +510,7 @@ static char rcsId[] = "$Id$";
{
ASSIGN(_applicationName,[[[components subarrayWithRange:NSMakeRange(index,tmpIndex-index+1)]
componentsJoinedByString:@"/"]
stringWithoutSuffix:appSuffix]);
stringByDeletingSuffix:appSuffix]);
index=tmpIndex+1;
};
};
@ -519,9 +519,9 @@ static char rcsId[] = "$Id$";
NSString* tmp=[[components subarrayWithRange:NSMakeRange(index,[components count]-index)]
componentsJoinedByString:@"/"];
if ([tmp hasSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]])
tmp=[tmp stringWithoutSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]];
tmp=[tmp stringByDeletingSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]];
else if ([tmp hasSuffix:GSWApplicationPSuffix[WONAMES_INDEX]])
tmp=[tmp stringWithoutSuffix:GSWApplicationPSuffix[WONAMES_INDEX]];
tmp=[tmp stringByDeletingSuffix:GSWApplicationPSuffix[WONAMES_INDEX]];
ASSIGN(_applicationName,tmp);
index=[components count];
};

6
GSWeb.framework/GSWHTMLParser.m
View file

@ -109,7 +109,7 @@
[astFactory addASTChild:ot_AST in:currentAST];
}
[self matchTokenType:GSWHTMLTokenType_OPENTAG];
[ot_AST setText:[[[ot_AST text] stringWithoutPrefix:@"<"] stringWithoutSuffix:@">"]];
[ot_AST setText:[[[ot_AST text] stringByDeletingPrefix:@"<"] stringByDeletingSuffix:@">"]];
break;
}
case GSWHTMLTokenType_CLOSETAG:
@ -120,7 +120,7 @@
[astFactory addASTChild:ct_AST in:currentAST];
}
[self matchTokenType:GSWHTMLTokenType_CLOSETAG];
[ct_AST setText:[[[ct_AST text] stringWithoutPrefix:@"</"] stringWithoutSuffix:@">"]];
[ct_AST setText:[[[ct_AST text] stringByDeletingPrefix:@"</"] stringByDeletingSuffix:@">"]];
break;
}
case GSWHTMLTokenType_COMMENT:
@ -131,7 +131,7 @@
[astFactory addASTChild:com_AST in:currentAST];
}
[self matchTokenType:GSWHTMLTokenType_COMMENT];
[com_AST setText:[[[com_AST text] stringWithoutPrefix:@"<!--"] stringWithoutSuffix:@"-->"]];
[com_AST setText:[[[com_AST text] stringByDeletingPrefix:@"<!--"] stringByDeletingSuffix:@"-->"]];
break;
}
default:

4
GSWeb.framework/GSWPageDefParser.m
View file

@ -205,7 +205,7 @@
[astFactory addASTChild:includeObj_AST in:currentAST];
}
[self matchTokenType:GSWPageDefParserTokenType_STRING];
[includes addObject:[self unescapedString:[[[includeObj text] stringWithoutPrefix:@"\""] stringWithoutSuffix:@"\""]]];
[includes addObject:[self unescapedString:[[[includeObj text] stringByDeletingPrefix:@"\""] stringByDeletingSuffix:@"\""]]];
include_AST = [currentAST root];
}
NS_HANDLER
@ -469,7 +469,7 @@
[astFactory addASTChild:assocConstantString_AST in:currentAST];
}
[self matchTokenType:GSWPageDefParserTokenType_STRING];
{ GSWAssociation* assoc=[GSWAssociation associationWithValue:[self unescapedString:[[[assocConstantString text] stringWithoutPrefix:@"\""] stringWithoutSuffix:@"\""]]];
{ GSWAssociation* assoc=[GSWAssociation associationWithValue:[self unescapedString:[[[assocConstantString text] stringByDeletingPrefix:@"\""] stringByDeletingSuffix:@"\""]]];
ASSIGN(currentAssociation,assoc); };
break;
}

4
GSWeb.framework/GSWRequest.m
View file

@ -1838,13 +1838,13 @@ into
NSDebugMLLog(@"requests",@"tmpString=%@",tmpString);
if ([tmpString hasSuffix:GSWPagePSuffix[GSWebNamingConv]])
{
gswpage=[tmpString stringWithoutSuffix:GSWPagePSuffix[GSWebNamingConv]];
gswpage=[tmpString stringByDeletingSuffix:GSWPagePSuffix[GSWebNamingConv]];
NSDebugMLLog(@"requests",@"gswpage=%@",gswpage);
index++;
}
else if ([tmpString hasSuffix:GSWPagePSuffix[GSWebNamingConvInversed]])
{
gswpage=[tmpString stringWithoutSuffix:GSWPagePSuffix[GSWebNamingConvInversed]];
gswpage=[tmpString stringByDeletingSuffix:GSWPagePSuffix[GSWebNamingConvInversed]];
NSDebugMLLog(@"requests",@"gswpage=%@",gswpage);
index++;
};

2
GSWeb.framework/GSWTemplateParserANTLR.m
View file

@ -229,7 +229,7 @@ static char rcsId[] = "$Id$";
{
NSDebugMLLog(@"low",@"tagName:[%@]",tagName);
if ([tagName hasPrefix:@"\""] && [tagName hasSuffix:@"\""])
tagName=[[tagName stringWithoutPrefix:@"\""]stringWithoutSuffix:@"\""];
tagName=[[tagName stringByDeletingPrefix:@"\""]stringByDeletingSuffix:@"\""];
NSDebugMLLog(@"low",@"Add tagName:[%@]",
tagName);
[_tagsNames setObject:tagName

8
GSWeb.framework/GSWTemplateParserXML.h
View file

@ -34,10 +34,10 @@
#include "GSWTemplateParser.h"
#include <Foundation/GSXML.h>
#include <parser.h>
#include <parserInternals.h>
#include <SAX.h>
#include <HTMLparser.h>
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
#include <libxml/SAX.h>
#include <libxml/HTMLparser.h>
@class GSWTemplateParser;

2
GSWeb.framework/GSWTemplateParserXML.m
View file

@ -32,7 +32,7 @@
static char rcsId[] = "$Id$";
#include <GSWeb/GSWeb.h>
#include <SAX.h>
#include <libxml/SAX.h>
extern xmlParserInputPtr xmlNewStringInputStream(xmlParserCtxtPtr ctxt,
const xmlChar *buffer);

2
GSWeb.framework/GSWUtils.m
View file

@ -1734,7 +1734,7 @@ NSData* HexStringToData(NSString* string)
while([good hasSuffix:@"/."])
{
if ([good length]>2)
good=[good stringWithoutSuffix:@"/."];
good=[good stringByDeletingSuffix:@"/."];
else
good=[NSString stringWithString:@"/"];
};

13
GSWeb.framework/Makefile.preamble → GSWeb.framework/Makefile.preamble.in
View file

@ -34,7 +34,7 @@
#
# Additional flags to pass to the preprocessor
ADDITIONAL_CPPFLAGS = -lwrap
ADDITIONAL_CPPFLAGS = -I..
# Additional flags to pass to the Objective-C compiler
ifeq ($(GDL2), yes)
@ -60,18 +60,13 @@ endif
ADDITIONAL_CFLAGS = -DUSE_BUILTIN
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I. -I$(GNUSTEP_SYSTEM_ROOT)/db -I../..
ADDITIONAL_INCLUDE_DIRS = -I. -I../.. @XML_CFLAGS@
# Additional LDFLAGS to pass to the linker
ifeq ($(debug), yes)
ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lFoundationExt_d -lxml -lz
LIBRARIES_DEPENP_UPON += -lFoundationExt_d @AUX_LIBS@
else
ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lFoundationExt -lxml -lz
endif
ifeq ($(LIBWRAP), yes)
ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DHAVE_LIBWRAP
ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lwrap
LIBRARIES_DEPEND_UPON += -lFoundationExt @AUX_LIBS@
endif
# Additional library directories the linker should search

6
GSWeb.framework/NSString+Trimming.m
View file

@ -264,7 +264,7 @@ static char rcsId[] = "$Id$";
-(NSString*)stringWithoutPrefix:(NSString*)prefix
andSuffix:(NSString*)suffix
{
return [[self stringWithoutPrefix:prefix]stringWithoutSuffix:suffix];
return [[self stringByDeletingPrefix:prefix] stringByDeletingSuffix:suffix];
};
//--------------------------------------------------------------------
@ -288,8 +288,8 @@ static char rcsId[] = "$Id$";
-(void)removePrefix:(NSString*)prefix
andSuffix:(NSString*)suffix
{
[self removePrefix:prefix];
[self removeSuffix:suffix];
[self deletePrefix:prefix];
[self deleteSuffix:suffix];
};
//--------------------------------------------------------------------

4
GSWeb.framework/PageDef.g
View file

@ -46,7 +46,7 @@ document
//TODO unescapedString
include:
(INCLUDE (WS)*)
includeObj:STRING { [includes addObject:[self unescapedString:[[[includeObj text] stringWithoutPrefix:@"\""] stringWithoutSuffix:@"\""]]]; }
includeObj:STRING { [includes addObject:[self unescapedString:[[[includeObj text] stringByDeletingPrefix:@"\""] stringByDeletingSuffix:@"\""]]]; }
;
object:
@ -86,7 +86,7 @@ mvalue:
{ { GSWAssociation* assoc=[GSWAssociation associationWithValue:[NSNumber numberWithBool:NO]];
ASSIGN(currentAssociation,assoc); }; }
| assocConstantString:STRING
{ { GSWAssociation* assoc=[GSWAssociation associationWithValue:[self unescapedString:[[[assocConstantString text] stringWithoutPrefix:@"\""] stringWithoutSuffix:@"\""]]];
{ { GSWAssociation* assoc=[GSWAssociation associationWithValue:[self unescapedString:[[[assocConstantString text] stringByDeletingPrefix:@"\""] stringByDeletingSuffix:@"\""]]];
ASSIGN(currentAssociation,assoc); }; }
| assocConstantHexNum:HEXNUM
{ { GSWAssociation* assoc=[GSWAssociation associationWithValue:[NSNumber valueFromString:[assocConstantHexNum text]]];

8
GSWeb.framework/html.g
View file

@ -74,10 +74,10 @@ document
: (
WS
| TEXT
| ot:OPENTAG { [ot_AST setText:[[[ot_AST text] stringWithoutPrefix:@"<"] stringWithoutSuffix:@">"]]; }
| ct:CLOSETAG { [ct_AST setText:[[[ct_AST text] stringWithoutPrefix:@"</"] stringWithoutSuffix:@">"]]; }
| com:COMMENT { [com_AST setText:[[[com_AST text] stringWithoutPrefix:@"<!--"] stringWithoutSuffix:@"-->"]]; }
/* | inc:INCLUDE { [inc_AST setText:[[[inc_AST text] stringWithoutPrefix:@"<#include "] stringWithoutSuffix:@"#>"]]; }*/
| ot:OPENTAG { [ot_AST setText:[[[ot_AST text] stringByDeletingPrefix:@"<"] stringByDeletingSuffix:@">"]]; }
| ct:CLOSETAG { [ct_AST setText:[[[ct_AST text] stringByDeletingPrefix:@"</"] stringbyDeletingSuffix:@">"]]; }
| com:COMMENT { [com_AST setText:[[[com_AST text] stringByDeletingPrefix:@"<!--"] stringByDeletingSuffix:@"-->"]]; }
/* | inc:INCLUDE { [inc_AST setText:[[[inc_AST text] stringByDeletingPrefix:@"<#include "] stringByDeletingSuffix:@"#>"]]; }*/
)+
;
/*4*/

16
Makefile.postamble
View file

@ -41,8 +41,17 @@ gsdocs:
# Things to do after compiling
# after-all::
#
# The following rule is important mainly for packaging, because in that case
# you install into a fake system tree, and the directory is not there.
#
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional:
$(MKDIRS) $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional
# Things to do before installing
# before-install::
before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional
$(INSTALL_DATA) gsweb.make \
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional/gsweb.make
# Things to do after installing
after-install::
@ -67,7 +76,10 @@ after-uninstall::
# Things to do after distcleaning
after-distclean::
rm -rf config.cache config.log config.status
rm -rf config.h config.mak
rm -rf config.h config.mak gsweb.make
gsweb.make: gsweb.make.in
./configure
# Things to do before checking
# before-check::

26
Version
View file

@ -4,22 +4,14 @@
GNUSTEP_GCC=2.8.0
# The version number of this release.
GNUSTEP_MAJOR_VERSION=1
GNUSTEP_MINOR_VERSION=0
GNUSTEP_SUBMINOR_VERSION=0
GNUSTEP_VERSION=\
${GNUSTEP_MAJOR_VERSION}.${GNUSTEP_MINOR_VERSION}.${GNUSTEP_SUBMINOR_VERSION}
VERSION=${GNUSTEP_VERSION}
MAJOR_VERSION=1
MINOR_VERSION=0
SUBMINOR_VERSION=0
GSWEB_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
VERSION=${GSWEB_VERSION}
# Other Products we depend on
GNUSTEP_LIBTIFF=3.4
GNUSTEP_DGS=0.5.0
GNUSTEP_DPSCLIENT=6.1
GNUSTEP_FTP_MACHINE=ftp.gnu.org
GNUSTEP_FTP_DIRECTORY=pub/gnu
GNUSTEP_SNAP_FTP_MACHINE=alpha.gnu.org
GNUSTEP_SNAP_FTP_DIRECTORY=gnu/gnustep
GNUSTEP_ALT_FTP_MACHINE=ftp.gnustep.org
GNUSTEP_ALT_FTP_DIRECTORY=pub/gnustep/core
GSWEB_FTP_MACHINE=ftp.gnustep.org
GSWEB_FTP_DIRECTORY=pub/gnustep/gsweb
GSWEB_SNAP_FTP_MACHINE=ftp.gnustep.org
GSWEB_SNAP_FTP_DIRECTORY=pub/daily-snapshots

31
config.h.in Normal file
View file

@ -0,0 +1,31 @@
/* Machine/OS specific configuration information for GSWeb
Copyright (C) 2002 Free Software Foundation, Inc.
Written by: Mirko Viviani <mirko.viviani@rccr.cremona.it>
This file is part of the GNUstep Base Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#ifndef included_config_h
#define included_config_h
#undef HAVE_LIBWRAP
#endif

154
config/pathxml.m4 Normal file
View file

@ -0,0 +1,154 @@
dnl Code shamelessly stolen from glib-config by Sebastian Rittau
dnl AM_PATH_XML([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
AC_DEFUN(AM_PATH_XML,[
AC_ARG_WITH(xml-prefix,
[ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
xml_config_prefix="$withval", xml_config_prefix="")
AC_ARG_ENABLE(xmltest,
[ --disable-xmltest Do not try to compile and run a test XML program],,
enable_xmltest=yes)
if test x$xml_config_prefix != x ; then
xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
if test x${XML_CONFIG+set} != xset ; then
XML_CONFIG=$xml_config_prefix/bin/xml-config
fi
fi
AC_PATH_PROG(XML2_CONFIG, xml2-config, no)
if test "$XML2_CONFIG" = "no" ; then
AC_PATH_PROG(XML_CONFIG, xml-config, no)
else
XML_CONFIG=$XML2_CONFIG
fi
min_xml_version=ifelse([$1], ,2.0.0, [$1])
AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
no_xml=""
if test "$XML_CONFIG" = "no" ; then
no_xml=yes
else
XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags`
XML_LIBS=`$XML_CONFIG $xml_config_args --libs`
xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_xmltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $XML_CFLAGS"
LIBS="$XML_LIBS $LIBS"
dnl
dnl Now check if the installed libxml is sufficiently new.
dnl
rm -f conf.xmltest
AC_TRY_RUN([
#include <stdlib.h>
#include <stdio.h>
#include <libxml/xmlversion.h>
#include <libxml/parser.h>
int
main()
{
int xml_major_version, xml_minor_version, xml_micro_version;
int major, minor, micro;
char *tmp_version;
system("touch conf.xmltest");
tmp_version = xmlStrdup("$min_xml_version");
if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_xml_version");
exit(1);
}
tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION);
if(sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
printf("%s, bad version string\n", "$min_xml_version");
exit(1);
}
if((xml_major_version != $xml_config_major_version) ||
(xml_minor_version != $xml_config_minor_version) ||
(xml_micro_version != $xml_config_micro_version))
{
printf("\n*** 'xml-config --version' returned %d.%d.%d, but libxml (%d.%d.%d)\n",
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version,
xml_major_version, xml_minor_version, xml_micro_version);
printf("*** was found! If xml-config was correct, then it is best\n");
printf("*** to remove the old version of libxml. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If xml-config was wrong, set the environment variable XML_CONFIG\n");
printf("*** to point to the correct copy of xml-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
else
{
if ((xml_major_version > major) ||
((xml_major_version == major) && (xml_minor_version > minor)) ||
((xml_major_version == major) && (xml_minor_version == minor) &&
(xml_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
xml_major_version, xml_minor_version, xml_micro_version);
printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** libxml is always available from ftp://ftp.gnome.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the xml-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of libxml, but you can also set the XML_CONFIG environment to point to the\n");
printf("*** correct copy of xml-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_xml" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$XML_CONFIG" = "no" ; then
echo "*** The xml-config script installed by libxml could not be found"
echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the XML_CONFIG environment variable to the"
echo "*** full path to xml-config."
else
if test -f conf.xmltest ; then
:
else
echo "*** Could not run libxml test program, checking why..."
CFLAGS="$CFLAGS $XML_CFLAGS"
LIBS="$LIBS $XML_LIBS"
dnl FIXME: AC_TRY_LINK
fi
fi
XML_CFLAGS=""
XML_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
rm -f conf.xmltest
])

3304
configure vendored Executable file
View file

File diff suppressed because it is too large Load diff

86
configure.ac Normal file
View file

@ -0,0 +1,86 @@
# configure.in for GSWeb library
# Process this file with autoconf to produce a configure script.
#
# Copyright (C) 1993,1994, 1995, 1996, 1997 Free Software Foundation, Inc.
#
# Written by: Mirko Viviani <mirko.viviani@rccr.cremona.it>
#
# This file is part of the GSWeb library.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
builtin(include, config/pathxml.m4)dnl
AC_INIT
if test -z "$GNUSTEP_SYSTEM_ROOT"; then
AC_MSG_ERROR([You must run the GNUstep initialization script first!])
fi
AC_CONFIG_HEADER(config.h)
#--------------------------------------------------------------------
# Check for libwrap
#--------------------------------------------------------------------
AC_CHECK_LIB(wrap, main, wrap_ok=yes, wrap_ok=no)
if test "$wrap_ok" = yes; then
AUX_LIBS="$AUX_LIBS -lwrap"
USE_LIBWRAP=1
AC_DEFINE(HAVE_LIBWRAP)
fi
#--------------------------------------------------------------------
# Check recent libxml for XML parser
#--------------------------------------------------------------------
# Save CFLAGS and LIBS as AM_PATH_XML clobbers these variables regardless
# of the success of the macro.
saved_LIBS="$LIBS"
saved_CFLAGS="$CFLAGS"
AM_PATH_XML(2.3.0, enable_libxml=yes, enable_libxml=no)
if test $enable_libxml = yes; then
CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
LIBS="$LIBS $XML_LIBS"
HAVE_LIBXML=1
AC_DEFINE(HAVE_LIBXML,1,
[Define if libxml available])
else
HAVE_LIBXML=0
# Restore the CFLAGS and LIBS because AM_PATH_XML messes them
LIBS="$saved_LIBS"
CFLAGS="$saved_CFLAGS"
fi
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------
AC_MSG_CHECKING(for the version of GSWeb we are compiling)
if test -f "Version"; then
. ./Version
fi
AC_MSG_RESULT($VERSION)
AC_SUBST(VERSION)
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
AC_SUBST(SUBMINOR_VERSION)
AC_SUBST(GCC_VERSION)
AC_SUBST(AUX_LIBS)
#--------------------------------------------------------------------
# Write the Makefiles
#--------------------------------------------------------------------
AC_CONFIG_FILES([gsweb.make GSWeb.framework/Makefile.preamble])
AC_OUTPUT

36
gsweb.make.in Normal file
View file

@ -0,0 +1,36 @@
#
# gsweb.make
#
# Makefile flags and configs to build with the base library.
#
# Copyright (C) 2002 Free Software Foundation, Inc.
#
# Author: Mirko Viviani <mirko.viviani@rccr.cremona.it>
# Based on code originally in the gnustep make package
#
# This file is part of the GNUstep Base Library.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# You should have received a copy of the GNU General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
ifeq ($(GSWEB_MAKE_LOADED),)
GSWEB_MAKE_LOADED=yes
GSWEB_VERSION = @VERSION@
GSWEB_MAJOR_VERSION = @MAJOR_VERSION@
GSWEB_MINOR_VERSION = @MINOR_VERSION@
GSWEB_SUBMINOR_VERSION = @SUBMINOR_VERSION@
AUXILIARY_INCLUDE_LIBS += @AUX_LIBS@
endif # GSWEB_MAKE_LOADED