SimDist
diff -u -r1.85 -r1.86
--- configure 23 Aug 2010 17:45:58 -0000 1.85
+++ configure 23 Aug 2010 18:12:08 -0000 1.86
@@ -2895,13 +2895,11 @@
xerces )
-
XERCES_VERSION=${package_version}
XERCES_BASEDIR=${package_base_dir}
XERCES_BUILDDIR=${package_base_dir}
XERCES_CONFIG=./configure
-
XERCES_CONFIG_OPTS="--enable-shared=yes --enable-static=yes --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no"
xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
@@ -2925,8 +2923,6 @@
-
-
;;
heppdt )
SimDist/build
diff -u -r1.41 -r1.42
--- packages.m4 20 Aug 2010 22:38:25 -0000 1.41
+++ packages.m4 23 Aug 2010 18:12:08 -0000 1.42
@@ -232,19 +232,6 @@
])
dnl
-dnl Macro for configuring the lcphys package.
-dnl
-dnl AC_DEFUN(AC_LCPHYS_PACKAGE, [
-
-dnl LCPHYS_CVSMODULE=LCPhys
-dnl LCPHYS_BASEDIR=$package_base_dir
-
-dnl AC_SUBST(LCPHYS_CVSMODULE)
-dnl AC_SUBST(LCPHYS_BASEDIR)
-
-dnl ])
-
-dnl
dnl Macro for configuring the mokka package.
dnl
AC_DEFUN(AC_MOKKA_PACKAGE, [
@@ -271,17 +258,11 @@
dnl
AC_DEFUN(AC_XERCES_PACKAGE, [
-dnl AC_SUBST(XERCES_OS)
-dnl AC_SUBST(XERCES_USE_SHARED_LIB)
-dnl AC_SUBST(XERCES_USE_STATIC_LIB)
-
XERCES_VERSION=${package_version}
XERCES_BASEDIR=${package_base_dir}
XERCES_BUILDDIR=${package_base_dir}
XERCES_CONFIG=./configure
-dnl XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes --prefix=${XERCES_BASEDIR}"
-
XERCES_CONFIG_OPTS="--enable-shared=yes --enable-static=yes --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no"
xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
@@ -291,8 +272,6 @@
XERCES_DOWNLOAD=${xerces_url}/${xerces_tgz}
XERCES_DIR_ORIG=xerces-c-${xerces_version_dot}
-dnl XERCES_OBJDIR=${XERCES_BASEDIR}/obj/${XERCES_OS}
-
AC_SUBST(XERCES_VERSION)
AC_SUBST(XERCES_BASEDIR)
AC_SUBST(XERCES_BUILDDIR)
@@ -301,8 +280,6 @@
AC_SUBST(XERCES_CONFIG)
AC_SUBST(XERCES_CONFIG_OPTS)
-dnl AC_SUBST(XERCES_OBJDIR)
-
])
dnl
@@ -338,27 +315,3 @@
AC_SUBST(LCDETECTORS_VERSION)
])
-
-dnl Define a package make var using autoconf substitution.
-dnl arg1 make variable name without "PACKAGE_" prefix
-dnl arg2 autoconf substitution varible without @@ enclosing chars
-dnl arg3 short name of package used to find package.gmk.in
-#AC_DEFUN(PACKAGE_MAKEVAR, [
-
-dnl package's gmk file
-#f=$sim_packages_dir/$1/package.gmk.in
-
-dnl cat var to package's gmk file
-#echo "export $2 = @$3@" >> $f ;
-
-dnl evaluate arg3 for value or use arg4, if it exists
-#if test -z "$4"
-#then
-# v=`eval echo $$3`
-#else
-# v=$4
-#fi
-
-#AC_SUBST($3, $v)
-
-#])
SimDist/build
diff -N xerces.m4
--- xerces.m4 21 Jul 2010 21:55:40 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-dnl Macro to setup Xerces configure arguments.
-AC_DEFUN(AC_XERCES, [
-
-XERCES_OS=$(uname | tr [[a-z]] [[A-Z]])
-XERCES_USE_SHARED_LIB=
-XERCES_USE_STATIC_LIB=1
-
-dnl case "$host_os" in
-
-dnl linux* )
-dnl XERCES_CONFIGURE_ARGS="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
-dnl ;;
-dnl cygwin* )
-dnl XERCES_CONFIGURE_ARGS="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
-dnl ;;
-dnl darwin* )
-dnl XERCES_CONFIGURE_ARGS="-pmacosx -nnative -tnative -rnone -P \$(PACKAGE_BASEDIR)"
-dnl XERCES_OS=MACOSX
-dnl XERCES_USE_SHARED_LIB=1
-dnl XERCES_USE_STATIC_LIB=
-dnl ;;
-
-dnl esac
-
-XERCES_CONFIG_OPTS="-nsocket -tnative -rnone --prefix=${XERCES_BASEDIR} --enable-shared=no --enable-static=yes"
-
-AC_SUBST(XERCES_CONFIG_OPTS)
-AC_SUBST(XERCES_OS)
-AC_SUBST(XERCES_USE_SHARED_LIB)
-AC_SUBST(XERCES_USE_STATIC_LIB)
-
-])
SimDist/packages/xerces
diff -u -r1.12 -r1.13
--- Makefile.in 20 Aug 2010 21:46:17 -0000 1.12
+++ Makefile.in 23 Aug 2010 18:12:08 -0000 1.13
@@ -1,36 +1,6 @@
-# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.12 2010/08/20 21:46:17 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.13 2010/08/23 18:12:08 jeremy Exp $
# generic package targets
include ../../build/package.gmk
-# default compile rule
-#XERCES_TARGETS = packageinfo debuginfo download config compile install
-
-# Determine the default target based on whether a static
-# Xerces library was built.
-#ifdef XERCES_USE_STATIC_LIB
-#all: $(XERCES_TARGETS) build_static_lib delete_shared_libs
-#else
-#all: $(XERCES_TARGETS)
-#endif
-
-#delete_shared_libs:
-# cd $(PACKAGE_BASEDIR)/lib; \
-# rm -rf *.so* *.dylib*;
-
-#build_static_lib:
-# echo XERCES_OBJDIR=$(XERCES_OBJDIR) ; \
-# cd $(XERCES_OBJDIR) ; \
-# ar -rc libxerces-c.a *.o; \
-# ranlib libxerces-c.a; \
-# cp libxerces-c.a $(PACKAGE_BASEDIR)/lib
-
-debuginfo:
- @echo XERCESCROOT=$(XERCESCROOT) ; \
- echo XERCES_LIB_DIR=$(XERCES_LIB_DIR) ; \
- echo XERCES_OS=$(XERCES_OS) ; \
- echo XERCES_OBJDIR=$(XERCES_OBJDIR) ; \
- echo XERCES_USE_SHARED_LIB=$(XERCES_USE_SHARED_LIB) ; \
- echo XERCES_USE_STATIC_LIB=$(XERCES_USE_STATIC_LIB) ;:
-
all: packageinfo download config compile install
SimDist/packages/xerces
diff -u -r1.6 -r1.7
--- env.gmk.in 26 Jun 2006 23:57:03 -0000 1.6
+++ env.gmk.in 23 Aug 2010 18:12:08 -0000 1.7
@@ -1,7 +1,2 @@
# Xerces build var
export XERCESCROOT=@XERCES_BASEDIR@
-export XERCES_LIB_DIR=@XERCES_BASEDIR@/lib
-export XERCES_OS=@XERCES_OS@
-export XERCES_OBJDIR=@XERCES_OBJDIR@
-export XERCES_USE_SHARED_LIB=@XERCES_USE_SHARED_LIB@
-export XERCES_USE_STATIC_LIB=@XERCES_USE_STATIC_LIB@
