Changeset 25624 for branches/eam_branches/20090715/psconfig

Timestamp:

Sep 27, 2009, 11:34:07 AM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090715/psconfig

Files:

• psconfig.bash.in (modified) (1 diff)
• tagsets/ipp-2.9.dist (modified) (1 diff)
• tagsets/ipp-2.9.libs (modified) (1 diff)
• tagsets/ipp-2.9.perl (modified) (1 diff)

branches/eam_branches/20090715/psconfig/psconfig.bash.in

@@ -35 +35 @@
 # environment variables
 export PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --path $version`
+export CPATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --cpath $version`
 export ARCH=`/bin/csh -f $PSCONFDIR/psconfig.csh --arch $version`
+export LIBRARY_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --library_path $version`
 export LD_LIBRARY_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --ld_library_path $version`
 export PKG_CONFIG_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --pkg_config_path $version`

branches/eam_branches/20090715/psconfig/tagsets/ipp-2.9.dist

@@ -74 +74 @@
   YYYYY  extsrc/gpcsw           ipp-2-9          -0
   YYYYY  magic                  ipp-2-9          -0
+  YYYYY  magic/censorObjects    ipp-2-9          -0
 
 # there are externally required C libraries and perl modules (see INSTALL)

branches/eam_branches/20090715/psconfig/tagsets/ipp-2.9.libs

@@ -23 +23 @@
 bin autoconf             NONE           NONE   autoconf-2.63.tar.gz     autoconf-2.63    N NONE NONE NONE
 bin automake             NONE           NONE   automake-1.10.tar.gz     automake-1.10    N NONE NONE NONE
-bin libtool              NONE           NONE   libtool-2.2.6a.tar.gz    libtool-2.2.6    N NONE NONE NONE
+bin libtool              NONE           NONE   libtool-2.2.6-p1.tar.gz  libtool-2.2.6-p1 N NONE NONE NONE
 bin pkg-config           NONE           NONE   pkg-config-0.23.tar.gz   pkg-config-0.23  N NONE NONE NONE
 

branches/eam_branches/20090715/psconfig/tagsets/ipp-2.9.perl

@@ -82 +82 @@
   78    SQL::Interp                     SQL-Interp-1.06.tar.gz
   79    Log::Dispatch::Email::MailSend  Log-Dispatch-2.22.tar.gz
+  80    Abstract::Meta::Class          Abstract-Meta-Class-0.11.tar.gz
+  81    DBIx::Connection               DBIx-Connection-0.13.tar.gz
+  82    Simple::SAX::Serializer        Simple-SAX-Serializer-0.05.tar.gz
+  83    Test::Distribution             Test-Distribution-2.00.tar.gz
+  84    Test::DBUnit                   Test::DBUnit-0.20.tar.gz