Menu
▾
▴
[Epp-rtk-cpp-commits] CVS: epp-rtk/c++ dist.sh,NONE,1.1.2.1 Makefile.am,1.1,1.1.2.1 clean.sh,1.1,1.1.2.1 configure.in,1.2,1.2.2.1 debug.sh,1.2,NONE final.sh,1.2,NONE install-sh,1.1,NONE missing,1.1,NONE mkinstalldirs,1.1,NONE
Update of /cvsroot/epp-rtk/epp-rtk/c++
In directory sc8-pr-cvs1:/tmp/cvs-serv5162
Modified Files:
Tag: epp-pre02
Makefile.am clean.sh configure.in
Added Files:
Tag: epp-pre02
dist.sh
Removed Files:
Tag: epp-pre02
debug.sh final.sh install-sh missing mkinstalldirs
Log Message:
bringing the old .info C++ rtk update to gcc 3.x standard for C++
and backporting the improved automake/autoconf from the 0.7.x
release of the C++ RTK
--- NEW FILE: dist.sh ---
#!/bin/bash
# on RedHat 7.3, two versions of autoconf
# are installed, but the older version
# is the default, so we have to explicitly
# look for the new executable
AUTOCONF_BIN=`which autoconf-2.53 2>/dev/null`
if [ "$AUTOCONF_BIN" == "" ]; then
AUTOCONF_BIN=autoconf
fi
# the default automake on RH7.3 is fine though
aclocal && automake --foreign --add-missing && $AUTOCONF_BIN && ./configure && make dist
Index: Makefile.am
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** Makefile.am 19 Jun 2001 19:16:37 -0000 1.1
--- Makefile.am 12 Dec 2003 23:24:29 -0000 1.1.2.1
***************
*** 1,5 ****
! PACKAGE=epprtk_cpp
! VERSION=1.00
SUBDIRS=src
! EXTRA_DIST=clean.sh final.sh debug.sh
! #docs/Makefile docs/docs.cfg
--- 1,12 ----
! PACKAGE=epp-rtk-cpp
! VERSION=0.1.3
SUBDIRS=src
! CLEANFILES = *~
!
! dist-hook:
! mkdir $(distdir)/epp
! cp -r ../epp $(distdir)/epp
! rm -rf `find $(distdir)/epp -name CVS`
! mkdir $(distdir)/idl
! cp -r ../idl $(distdir)/idl
! rm -rf `find $(distdir)/idl -name CVS`
Index: clean.sh
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/clean.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** clean.sh 19 Jun 2001 19:16:37 -0000 1.1
--- clean.sh 12 Dec 2003 23:24:29 -0000 1.1.2.1
***************
*** 1,24 ****
#!/bin/sh
! make clean
! rm -f clean
! rm -f src/*.o
! rm -f *~
! rm -f src/*~
! rm -f src/Makefile
! rm -f src/Makefile.in
! rm -f src/data/*~
! rm -f src/data/Makefile
! rm -f src/data/Makefile.in
! rm -f src/ssl/*~
! rm -f src/ssl/Makefile
! rm -f src/sl/Makefile.in
! rm -f src/transport/*~
! rm -f src/transport/Makefile
! rm -f src/transport/Makefile.in
! rm -f config.log
! rm -f config.cache
! rm -f config.status
! rm -f configure
! rm -f Makefile
! rm -f Makefile.in
--- 1,30 ----
#!/bin/sh
! rm -rf clean
! rm -rf src/*.o
! rm -rf *~
! rm -rf src/*~
! rm -rf `find . -name '.deps' -print`
! rm -rf src/Makefile
! rm -rf src/Makefile.in
! rm -rf src/data/*~
! rm -rf src/data/Makefile
! rm -rf src/data/Makefile.in
! rm -rf src/ssl/*~
! rm -rf src/ssl/Makefile
! rm -rf src/sl/Makefile.in
! rm -rf src/transport/*~
! rm -rf src/transport/Makefile
! rm -rf src/transport/Makefile.in
! rm -rf config.log
! rm -rf config.cache
! rm -rf config.status
! rm -rf configure
! rm -rf Makefile
! rm -rf Makefile.in
! rm -rf aclocal.m4
! rm -rf autom4te.cache
! rm -rf autoscan.log
! rm -rf configure.scan
! rm -rf src/ssl/Makefile.in
! rm -rf epp idl
Index: configure.in
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/configure.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** configure.in 28 Jun 2001 16:39:55 -0000 1.2
--- configure.in 12 Dec 2003 23:24:29 -0000 1.2.2.1
***************
*** 1,7 ****
dnl Process this file with autoconf to produce a configure script.
! AC_INIT(src/config.h)
! PACKAGE=epprtk_cpp
! VERSION=1.00
AUTOMAKE=automake
AC_SUBST(PACKAGE)
--- 1,10 ----
dnl Process this file with autoconf to produce a configure script.
! AC_PREREQ(2.53)
! AC_INIT([epp-rtk-cpp], [0.7.1])
! AC_CONFIG_SRCDIR(src/config.h)
! AM_INIT_AUTOMAKE(1.6.3)
! PACKAGE=epp-rtk-cpp
! VERSION=0.7.1
AUTOMAKE=automake
AC_SUBST(PACKAGE)
***************
*** 9,12 ****
--- 12,17 ----
AC_SUBST(AUTOMAKE)
+ AC_PREFIX_DEFAULT(/usr/local/epp-rtk)
+
dnl Checks for programs.
AC_PROG_INSTALL
***************
*** 14,18 ****
AC_PROG_RANLIB
AC_PROG_CXX
! AC_ARG_PROGRAM
dnl Checks for libraries.
--- 19,28 ----
AC_PROG_RANLIB
AC_PROG_CXX
! AC_SUBST(OBJEXT)
!
! AC_ARG_ENABLE(rtk_debug,
! [ --enable-rtk-debug Compilation flag to allow debugging (defines RTK_DEBUG)],
! AC_DEFINE(RTK_DEBUG,,)
! )
dnl Checks for libraries.
***************
*** 20,30 ****
dnl Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
! CPPFLAGS="-I/usr/include -I/usr/local/include/ -I/usr/local/xerces"
CXXFLAGS="--ansi -Wall -g -O2"
! #AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
! AC_CHECK_HEADERS(dom/DOM.hpp parsers/DOMParser.hpp util/PlatformUtils.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
! AC_CHECK_HEADERS(util/XMLString.hpp util/XMLUniDefs.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
dnl Checks for typedefs, structures, and compiler characteristics.
--- 30,80 ----
dnl Checks for header files.
AC_HEADER_DIRENT
+ #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
! # we're defining PERL5 as a cheat to prevent
! # openssl 0.9.6x from conflicting with unistd.h
! # in RedHat9
! AC_DEFINE(PERL5,,[Using this to resolve a conflict between openssl 0.9.6x and unistd.h in crypt() declaration])
!
! DOMTOOLS_PATH="/usr/local/domtools"
! AC_ARG_WITH(domtools, [ --with-domtools=/path/to/domtools To specify a domtools location other than /usr/local],
! DOMTOOLS_PATH=$withval
! )
! AC_SUBST(DOMTOOLS_PATH)
!
! 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)
!
! OPENSSL_PATH="/usr/local/openssl"
! AC_ARG_WITH(openssl, [ --with-openssl=/path/to/openssl To specify an OpenSSL installation other than /usr/local/openssl],
! OPENSSL_PATH=$withval
! )
! AC_SUBST(OPENSSL_PATH)
!
! CPPFLAGS="-I$OPENSSL_PATH/include -I$XERCES_INCLUDE -I$DOMTOOLS_PATH/include"
CXXFLAGS="--ansi -Wall -g -O2"
! AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/x509.h,, AC_MSG_ERROR("Missing header - probably missing openssl -- we're looking in $OPENSSL_PATH/include for headers"))
! AC_CHECK_HEADERS(domtools/domtools.h,, AC_MSG_ERROR("Missing header - probably missing domtools -- we're looking in $DOMTOOLS_PATH/include for headers"))
! 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.
--- debug.sh DELETED ---
--- final.sh DELETED ---
--- install-sh DELETED ---
--- missing DELETED ---
--- mkinstalldirs DELETED ---
|