updated to vdt-1.5.0 and to ETICS repository if needed

diff --git a/org.glite.lb/lb4vdt/Makefile.inc b/org.glite.lb/lb4vdt/Makefile.inc
index ccf0f2b..c9c3072 100644 (file)
--- a/org.glite.lb/lb4vdt/Makefile.inc
+++ b/org.glite.lb/lb4vdt/Makefile.inc
@@ -1,47 +1,61 @@
-# external dependencies:
+#
+# common setting
+#
 
-# missing packages could be downloaded to repository from
-# http://egee-jra1-integration.web.cern.ch/egee-jra1-integration/repository/
-#repository=/home/honik/egee/repository
-
-#vdt_location=/home/honik/egee/vdt-1.3.11
+#vdt_location=/home/honik/egee/vdt-1.5.0
 vdt_location=${VDT_LOCATION}
 
+# missing packages could be for example downloaded to repository from
+# http://eticssoft.web.cern.ch/eticssoft/repository/externals
+
+repository=/home/honik/egee/repository/externals/
+platform=slc3_ia32_gcc323
 
-#cares_prefix=${repository}/c-ares/1.3.0/rhel30_gcc32
-cares_prefix=/software/cares-1.3
 
-#classads_prefix=${repository}/classads/0.9.6/rhel30_gcc32
+#
+# external dependencies that are already part of VDT (vdt-1.5.0):
+#
+
+#classads_prefix=${repository}/classads/0.9.8/${platform}
 classads_prefix=${vdt_location}/classads
 
-# not needed (used "only" for unit tests - 'make check'):
-#cppunit_prefix=${repository}/cppunit/1.10.2/rhel30_gcc32
-cppunit_prefix=/software/cppunit-1.10.2
+#globus_prefix=${repository}/globus/2.4.3-VDT-1.2.5/${platform}
+globus_prefix=${vdt_location}/globus
 
 #expat_prefix=/usr
 expat_prefix=${vdt_location}/expat
 
-#globus_prefix=${repository}/globus/2.4.3-VDT-1.2.2/rhel30_gcc32
-globus_prefix=${vdt_location}/globus
+#mysql_prefix=${repository}/mysql-devel/4.1.11/${platform}
+mysql_prefix=${vdt_location}/mysql
+mysql_version=4.1.21
+
+voms_prefix=${vdt_location}/glite
+#voms_prefix=/home/honik/egee/glite/stage
 
+
+#
+# external dependencies that are NOT (yet) part of VDT (vdt-1.5.0):
+#
+
+#cares_prefix=${repository}/c-ares/1.3.0/${platform}
+cares_prefix=/software/cares-1.3
+
+# probably not needed (used "only" for unit tests - 'make check'):
+#cppunit_prefix=${repository}/cppunit/1.10.2/${platform}
+cppunit_prefix=/software/cppunit-1.10.2
+
+# probably not needed:
 #gridsite_prefix=${stagedir}
 
 gsoap_default_version=2.7.6b
 gsoap_versions=${gsoap_default_version}
-#gsoap_name=gsoap
-#gsoap_platform=rhel30_gcc32
-#gsoap_prefix=${repository}/${gsoap_name}/${gsoap_default_version}/${gsoap_platform}
+#gsoap_prefix=${repository}/gsoap/${gsoap_default_version}/${platform}
 gsoap_prefix=/software/gsoap-${gsoap_default_version}
 
-#mysql_prefix=${repository}/mysql/4.1.11/rhel30_gcc32
-mysql_prefix=${vdt_location}/mysql
-mysql_version=4.1.11
-
-voms_prefix=${vdt_location}/glite
-#voms_prefix=/home/honik/egee/glite/stage
-
 
-# some defaults:
+#
+# some other defaults:
+#
 
 #PREFIX=${vdt_location}/glite
 PREFIX=/tmp/lb4vdt