From 37bca9912e176787571bb81f1cb7d5927e7f8b57 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 8 Dec 2010 15:07:10 +0000
Subject: [PATCH] Other EMI build fixes: - VOMS headers moved for EMI/EPEL -
 fix build of the client

---
 org.glite.px.proxyrenewal/Makefile       | 8 +++++---
 org.glite.px.proxyrenewal/src/commands.c | 2 +-
 org.glite.px.proxyrenewal/src/renew.c    | 2 +-
 org.glite.px.proxyrenewal/src/voms.c     | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index a3b94ae..764417c 100644
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -54,7 +54,7 @@ MYPROXY_THR_INC:= -I${myproxy_prefix}/include/${thrflavour}
 MYPROXY_LIB_NOTHR :=-L${myproxy_prefix}/lib -lmyproxy_${nothrflavour}
 MYPROXY_LIB_THR:=-L${myproxy_prefix}/lib -lmyproxy_${thrflavour}
 
-VOMSINC:=-I${voms_prefix}/include
+VOMSINC:=-I${voms_prefix}/include -I${voms_prefix}/include/security/voms
 
 GLOBUS_GSSAPI_GSI_CFLAGS?=${GLOBUS_NOTHR_INC}
 GLOBUS_GSSAPI_GSI_LIBS?=${GLOBUS_NOTHR_LIBS}
@@ -105,9 +105,11 @@ VOMS_LIB_THR := -L${voms_prefix}/${libdir} -lvomsc_${thrflavour}
 ifeq (${thrflavour},)
 lib_LTLIBRARIES=${LIB} ${LIB_CORE}
 default_libcore=${LIB_CORE}
+default_lib=${LIB}
 else
 lib_LTLIBRARIES=${NOTHRLIB} ${THRLIB} ${LIB_CORE_NOTHR}
 default_libcore=${LIB_CORE_NOTHR}
+default_lib=${NOTHRLIB}
 endif
 
 DAEMON:=glite-proxy-renewd
@@ -140,8 +142,8 @@ endif
 ${DAEMON}: ${DAEMONOBJ} ${default_libcore}
 	${LINK} -o $@ ${DAEMONOBJ} ${default_libcore}
 
-${CLIENT}: ${CLIENTOBJ} ${NOTHRLIB}
-	${LINK} -o $@ ${CLIENTOBJ} ${NOTHRLIB} ${GLOBUS_GSSAPI_GSI_LIBS}
+${CLIENT}: ${CLIENTOBJ} ${default_lib}
+	${LINK} -o $@ ${CLIENTOBJ} ${default_lib} ${GLOBUS_GSSAPI_GSI_LIBS}
 
 ${THRLIBOBJ} ${LIB_CORE_THR_OBJS}: %.thr.o: %.c
 	${COMPILE} ${MYPROXY_THR_INC} ${GLOBUS_THR_INC} -o $@ -c $<
diff --git a/org.glite.px.proxyrenewal/src/commands.c b/org.glite.px.proxyrenewal/src/commands.c
index abc4809..9ffe90b 100644
--- a/org.glite.px.proxyrenewal/src/commands.c
+++ b/org.glite.px.proxyrenewal/src/commands.c
@@ -1,7 +1,7 @@
 #include "renewal_locl.h"
 #include "renewd_locl.h"
 
-#include "glite/security/voms/voms_apic.h"
+#include "voms/voms_apic.h"
 
 #ident "$Header$"
 
diff --git a/org.glite.px.proxyrenewal/src/renew.c b/org.glite.px.proxyrenewal/src/renew.c
index 29105d2..1c34ff7 100644
--- a/org.glite.px.proxyrenewal/src/renew.c
+++ b/org.glite.px.proxyrenewal/src/renew.c
@@ -1,7 +1,7 @@
 #include "renewal_locl.h"
 #include "renewd_locl.h"
 
-#include "glite/security/voms/voms_apic.h"
+#include "voms/voms_apic.h"
 
 #ident "$Header$"
 
diff --git a/org.glite.px.proxyrenewal/src/voms.c b/org.glite.px.proxyrenewal/src/voms.c
index 687d93b..c7af4fb 100644
--- a/org.glite.px.proxyrenewal/src/voms.c
+++ b/org.glite.px.proxyrenewal/src/voms.c
@@ -4,9 +4,9 @@
 #include <string.h>
 #include <openssl/x509.h>
 
-#include "glite/security/voms/voms_apic.h"
+#include "voms/voms_apic.h"
 
-#include "glite/security/voms/newformat.h"
+#include "voms/newformat.h"
 
 char * Decode(const char *, int, int *);
 char **listadd(char **, char *, int);
-- 
1.8.2.3