From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 22 Feb 2011 13:37:22 +0000 (+0000)
Subject: Little cleanups for EMI/EPEL.
X-Git-Tag: glite-jobid-api-c_R_2_0_0_2~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=582ad2d4bd5193e39fcbf8e45bc2dad3fbdd7707;p=jra1mw.git

Little cleanups for EMI/EPEL.
---

diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile
index 9102a2d..d1b1ef0 100644
--- a/org.glite.lb.yaim/Makefile
+++ b/org.glite.lb.yaim/Makefile
@@ -18,7 +18,13 @@ install:
 	for c in gip_lb glite_lb info_service_lb ; do \
 		install -m 0644 $(top_srcdir)/config/functions/config_$$c $(PREFIX)/yaim/functions; \
 	done
-	install -m 0644 $(top_srcdir)/config/node-info.d/glite-lb $(PREFIX)/yaim/node-info.d
+	# dirthy hack for EPEL - flavour-less globus not initialized by gpt
+	if test "x$(thrflavour)" = "x"; then \
+		grep -v config_globus_clients $(top_srcdir)/config/node-info.d/glite-lb > glite-lb; \
+		install -m 0644 glite-lb $(PREFIX)/yaim/node-info.d; \
+	else \
+		install -m 0644 $(top_srcdir)/config/node-info.d/glite-lb $(PREFIX)/yaim/node-info.d; \
+	fi
 	echo "$(package) $(module.version)-$(module.age)" > $(PREFIX)/yaim/etc/versions/$(package)
 
 stage:
diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb b/org.glite.lb.yaim/config/functions/config_glite_lb
index ca6c1b7..800531d 100644
--- a/org.glite.lb.yaim/config/functions/config_glite_lb
+++ b/org.glite.lb.yaim/config/functions/config_glite_lb
@@ -2,6 +2,23 @@ function config_glite_lb_check(){
   requires $1 MYSQL_PASSWORD INSTALL_ROOT GLITE_LOCATION GLITE_LOCATION_VAR GLITE_USER
 }
 
+# check directory existence first
+# (most of the dependencies should be in default locations now)
+function config_glite_lb_libs_append() {
+  prefix="$1"
+
+  if [ x`uname -m` = xx86_64 ]; then
+    if [ -d "$prefix/lib64" ]; then
+      libarch=lib64
+    fi
+  fi
+  libarch=${libarch:-'lib'}
+
+  if [ -d "$prefix/$libarch" ]; then
+    yaimgridpath_append LD_LIBRARY_PATH "$prefix/$libarch"
+  fi
+}
+
 function config_glite_lb_setenv(){
 
   yaimgridenv_set GLITE_USER ${GLITE_USER:-glite}
@@ -70,23 +87,12 @@ function config_glite_lb_setenv(){
   fi
   yaimgridenv_set GLITE_LB_TYPE ${GLITE_LB_TYPE:-server}
 
-  cares_prefix=${INSTALL_ROOT:-/opt}/c-ares
-  classads_prefix=${INSTALL_ROOT:-/opt}/classads
-  log4c_prefix=${INSTALL_ROOT:-/opt}/log4c
-  if [ x`uname -m` = xx86_64 ]; then
-    if [ -d "$cares_prefix/lib64" ]; then
-      cares_libarch=lib64
-    fi
-    if [ -d "$classads_prefix/lib64" ]; then
-      classads_libarch=lib64
-    fi
-    if [ -d "$log4c_prefix/lib64" ]; then
-      log4c_libarch=lib64
-    fi
-  fi
-  yaimgridpath_append LD_LIBRARY_PATH $cares_prefix/${cares_libarch:-lib}
-  yaimgridpath_append LD_LIBRARY_PATH $classads_prefix/${classads_libarch:-lib}
-  yaimgridpath_append LD_LIBRARY_PATH $log4c_prefix/${log4c_libarch:-lib}
+  config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/c-ares
+  config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/classads
+  config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/log4c
+  config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/apr-dev
+  config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/aprutil-dev
+  config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/activemq-cpp-library
 }
 
 function config_glite_lb_authz() {