From: Daniel M. <tub...@us...> - 2003-07-18 18:48:27
|
Update of /cvsroot/epp-rtk/domtools In directory sc8-pr-cvs1:/tmp/cvs-serv32439 Modified Files: Makefile.am clean.sh configure.in Removed Files: debug.sh final.sh install-sh missing mkinstalldirs Log Message: clean up for preparation for a distribution with newer versions of automake/autoconf Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/domtools/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 13 Jun 2002 09:39:44 -0000 1.6 --- Makefile.am 18 Jul 2003 18:48:24 -0000 1.7 *************** *** 1,4 **** PACKAGE=domtools ! VERSION=1.05 SUBDIRS=src tests ! EXTRA_DIST=clean.sh final.sh debug.sh docs/Makefile docs/docs.cfg --- 1,4 ---- PACKAGE=domtools ! VERSION=1.0.6 SUBDIRS=src tests ! CLEANFILES = *~ Index: clean.sh =================================================================== RCS file: /cvsroot/epp-rtk/domtools/clean.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** clean.sh 30 Apr 2003 14:04:09 -0000 1.2 --- clean.sh 18 Jul 2003 18:48:24 -0000 1.3 *************** *** 1,16 **** #!/bin/sh ! rm -f clean ! rm -f src/*.o ! rm -f lib/* ! rm -f include/* ! rm -f *~ rm -rf src/.deps ! rm -f src/*~ ! rm -f docs/*~ ! rm -f configure ! rm -f config.log ! rm -f config.cache ! rm -f config.status ! rm -f Makefile ! rm -f Makefile.in --- 1,23 ---- #!/bin/sh ! rm -rf clean ! rm -rf src/*.o ! rm -rf lib/* ! rm -rf include/* ! rm -rf *~ rm -rf src/.deps ! rm -rf src/*~ ! rm -rf docs/*~ ! rm -rf configure ! rm -rf config.log ! rm -rf config.cache ! rm -rf config.status ! rm -rf Makefile ! rm -rf Makefile.in ! rm -rf aclocal.m4 ! rm -rf autom4te.cache ! rm -rf src/Makefile ! rm -rf src/Makefile.in ! rm -rf tests/Makefile ! rm -rf tests/Makefile.in ! Index: configure.in =================================================================== RCS file: /cvsroot/epp-rtk/domtools/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.in 28 Apr 2003 21:48:45 -0000 1.8 --- configure.in 18 Jul 2003 18:48:24 -0000 1.9 *************** *** 1,8 **** dnl Process this file with autoconf to produce a configure script. ! AC_INIT(src/domtools.h) AUTOMAKE=automake - PACKAGE=domtools - VERSION=1.05 AC_SUBST(PACKAGE) AC_SUBST(VERSION) --- 1,9 ---- dnl Process this file with autoconf to produce a configure script. ! AC_PREREQ(2.53) ! AC_INIT([domtools], [1.0.6]) ! AC_CONFIG_SRCDIR(src/domtools.h) ! AM_INIT_AUTOMAKE(1.6.3) AUTOMAKE=automake AC_SUBST(PACKAGE) AC_SUBST(VERSION) *************** *** 10,24 **** dnl Checks for programs. - AC_PROG_AWK - AC_PROG_CC AC_PROG_INSTALL - AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_CXX ! AC_ARG_PROGRAM ! ! dnl Checks for libraries. dnl Checks for header files. --- 11,25 ---- dnl Checks for programs. AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_CXX ! AC_SUBST(OBJEXT) + #If the following line does not work, try AC_LANG(C) instead + AC_LANG_C + AC_HEADER_STDC + #If the following line does not work, try AC_LANG(C++) instead + AC_LANG_CPLUSPLUS dnl Checks for header files. *************** *** 26,39 **** #AC_CHECK_HEADERS(someheader.h) dnl Some places Xerces include files have been known to be in /usr/local/dom etc. ! CPPFLAGS="-I/usr/local -I/usr/local/xerces -I/usr/local/xerces/include/ -I/usr/local/gnr/include/ -Wall" ! AC_CHECK_HEADERS(xercesc/dom/DOM.hpp xercesc/parsers/DOMParser.hpp xercesc/util/PlatformUtils.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces")) ! AC_CHECK_HEADERS(xercesc/util/XMLString.hpp xercesc/util/XMLUniDefs.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces")) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE - - dnl Checks for library functions. - #AC_CHECK_FUNCS(somefunction) AC_OUTPUT(src/Makefile tests/Makefile Makefile) --- 27,57 ---- #AC_CHECK_HEADERS(someheader.h) dnl Some places Xerces include files have been known to be in /usr/local/dom etc. ! XERCES_INCLUDE="/usr/local/xerces/include" ! AC_ARG_WITH(xerces_include, [ --with-xerces-include=/path/to/xerces/include To specify a xerces include other than /usr/local/xerces/include], ! XERCES_INCLUDE=$withval ! ) ! AC_SUBST(XERCES_INCLUDE) ! ! XERCES_LIB="/usr/local/xerces/lib/libxerces.so" ! AC_ARG_WITH(xerces_lib, [ --with-xerces-lib=xerces-1.x-libfile To specify a xerces lib other than /usr/local/xerces/lib/libxerces.so], ! XERCES_LIB=$withval ! ) ! AC_SUBST(XERCES_LIB) ! ! CPPFLAGS="-I$OPENSSL_PATH/include -I$XERCES_INCLUDE" ! CXXFLAGS="--ansi -Wall -g -O2" ! AC_CHECK_HEADERS(xercesc/parsers/DOMParser.hpp xercesc/util/PlatformUtils.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces -- we're looking in $XERCES_INCLUDE for headers")) ! #Only here for deprecated functions: ! AC_CHECK_HEADERS(xercesc/dom/DOM.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces")) ! AC_CHECK_HEADERS(xercesc/util/XMLString.hpp xercesc/util/XMLUniDefs.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces -- we're looking in $XERCES_INCLUDE for headers")) ! ! AC_CHECK_FILE($XERCES_LIB,,AC_MSG_ERROR("Didn't find xerces shared lib (trying to use $XERCES_LIB)! Use --with-xerces-lib=arg to specify your own lib")) ! ! AC_CHECK_LIB(socket,shutdown,,,) ! AC_CHECK_LIB(xnet,gethostbyname,,,) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE AC_OUTPUT(src/Makefile tests/Makefile Makefile) --- debug.sh DELETED --- --- final.sh DELETED --- --- install-sh DELETED --- --- missing DELETED --- --- mkinstalldirs DELETED --- |