--- c/src/Makefile.in.orig Mon Oct 2 18:11:13 2000
+++ c/src/Makefile.in Mon Oct 2 18:13:10 2000
@@ -131,14 +131,14 @@
endif
# We need the Xerces library
-ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_2
-XERCESLIB = $(XERCESCROOT)/lib/libxerces-c1_2.so
+ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c
+XERCESLIB = $(XERCESCROOT)/lib/libxerces-c
XSL_BUILD_OPTIONS =
# We have to use the includes from the source distribution, since we use
# headers that others normally wouldn't
-XSL_INCL = -I . -I $(XERCESCROOT)/src/
+XSL_INCL = -I . -I $(XERCESCROOT)
###################################################################
# IMPORTANT NOTE #
@@ -184,7 +184,7 @@
PROJECT_NAME = xalan-c
LIBNAME = lib${PROJECT_NAME}
THISLIB = ${LIB_DIR}/${LIBNAME}
-VER = 0_40
+VER = .0.40.0
PRODUCTNAME=xalan
PRODUCTVERSION=${VER}
@@ -237,22 +237,24 @@
$(BINTARGETDIR)/testXSLT: $(TESTXSLT_DIR)/process.cpp
${LINK} ${PLATFORM_LIB_LINK_OPTIONS} $^ -o $@ $(XSL_INCL) \
- ${LIBRARY_SEARCH_PATHS} ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $(CXXFLAGS)
+ ${LIBRARY_SEARCH_PATHS} ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS)
$(BINTARGETDIR)/testXPath: $(TESTXPATH_DIR)/TestXPath.cpp \
$(TESTXPATH_DIR)/NodeNameTreeWalker.cpp
${LINK} ${PLATFORM_LIB_LINK_OPTIONS} $^ -o $@ $(XSL_INCL) \
- ${LIBRARY_SEARCH_PATHS} ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $(CXXFLAGS)
+ ${LIBRARY_SEARCH_PATHS} ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS)
-lib: $(THISLIB)$(VER)$(SHLIBSUFFIX)
+lib: $(THISLIB)$(SHLIBSUFFIX)$(VER)
-$(THISLIB)$(VER)$(SHLIBSUFFIX): $(ALL_OBJECTS)
+$(THISLIB)$(SHLIBSUFFIX)$(VER): $(ALL_OBJECTS)
$(MAKE_SHARED) -o $@ $^ $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
+ ln -s $(THISLIB)$(SHLIBSUFFIX)$(VER) $(THISLIB)$(SHLIBSUFFIX)
+ ln -s $(THISLIB)$(SHLIBSUFFIX)$(VER) $(THISLIB)$(SHLIBSUFFIX).0
clean:
rm $(ALL_OBJECTS_DIR)/*.o
- rm $(THISLIB)$(VER)$(SHLIBSUFFIX)
+ rm $(THISLIB)$(SHLIBSUFFIX)$(VER)
rm $(BINTARGETDIR)/testXSLT
rm $(BINTARGETDIR)/testXPath
--- c/src/Include/GCCDefinitions.hpp.mdk Thu Oct 5 16:02:07 2000
+++ c/src/Include/GCCDefinitions.hpp Thu Oct 5 16:02:11 2000
@@ -85,5 +85,6 @@
#define XALAN_SGI_BASED_STL
+#define XALAN_CANNOT_MUTATE_ANONYMOUS_OBJECT
#endif // GCCDEFINITIONS_HEADER_GUARD_1357924680
--- c/src/Include/GCCDefinitions.hpp Thu Oct 5 16:37:26 2000
+++ c/src/Include/GCCDefinitions.hpp.mdk Thu Oct 5 16:37:33 2000
@@ -73,7 +73,7 @@
#define XALAN_NO_MEMBER_TEMPLATES
-#define XALAN_OLD_AUTO_PTR
+#undef XALAN_OLD_AUTO_PTR
#define XALAN_NO_COVARIANT_RETURN_TYPE
#define XALAN_NEED_SPECIAL_NAN_SUPPORT
#define NO_STD_LIMITS
