From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 8 Mar 2011 18:05:26 +0000 (+0000)
Subject: Fix build problems with VOMS:
X-Git-Tag: glite-lb-server_R_2_2_3_1~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bd371d280cb4286fad39e8140448346791b0b095;p=jra1mw.git

Fix build problems with VOMS:
- search for external dependencies in stage area too
- fix proxyrenewal build
- proxyrenewal configure sync
---

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index b35b5af..1f45bd9 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -283,22 +283,23 @@ die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},{
 if ($mode eq 'build') { for my $ext (keys %externs) {
 	if (defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; }
 	elsif (defined $externs{$ext}{pkg}) {
-		my ($prefix, $flag);
+		my ($prefix, $flag, $env);
 		my $pkg = $externs{$ext}{pkg};
 		my $flagname = uc $externs{$ext}{pkg};
 		$flagname =~ s/-[0-9\.]*$//;
 		$flagname =~ s/-/_/g;
 
 		print "Checking $pkg ... ";
-		`pkg-config "$pkg" --exists >/dev/null`;
+		$env = "PKG_CONFIG_PATH=$stagedir$prefix/$libdir/pkgconfig";
+		`$env pkg-config $pkg --exists >/dev/null`;
 		if ($? == 0) {
-			$externs{$ext}{prefix}=`pkg-config $pkg --variable=prefix`;
+			$externs{$ext}{prefix}=`$env pkg-config $pkg --variable=prefix`;
 			chomp $externs{$ext}{prefix};
 			print "$externs{$ext}{prefix}\n";
 
-			$flag=`pkg-config $pkg --cflags`;
+			$flag=`$env pkg-config $pkg --cflags`;
 			$externs{$ext}{flags} .= "${flagname}_CFLAGS=$flag" if ($flag);
-			$flag=`pkg-config $pkg --libs`;
+			$flag=`$env pkg-config $pkg --libs`;
 			$externs{$ext}{flags} .= "${flagname}_LIBS=$flag" if ($flag);
 		} else {
 			print "(using default $externs{$ext}{prefix})\n";
diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index f595e20..c8d741a 100644
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -67,7 +67,8 @@ DEBUG:=-g -O0
 CFLAGS:= ${CFLAGS} ${DEBUG} \
 	${VOMS_CFLAGS} \
 	-I${top_srcdir}/src -I${top_srcdir}/interface \
-	-I${glite_location}/include
+	-I${glite_location}/include \
+	 -DLOCAL_PX_COMPILE=1
 
 offset=1
 version_info:=-version-info ${shell \
@@ -153,7 +154,7 @@ ${THRLIBOBJ} ${LIB_CORE_THR_OBJS}: %.thr.o: %.c
 	${COMPILE} ${MYPROXY_THR_INC} ${GLOBUS_THR_INC} -o $@ -c $<
 
 %.o: %.c
-	${COMPILE} ${MYPROXY_CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} -DLOCAL_PX_COMPILE=1 -c $<
+	${COMPILE} ${MYPROXY_CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} -c $<
 
 ${EXAMPLES}: %: %.o
 	${LINK} -o $@ $< ${default_libcore}
diff --git a/org.glite.px.proxyrenewal/configure b/org.glite.px.proxyrenewal/configure
index b35b5af..1f45bd9 100755
--- a/org.glite.px.proxyrenewal/configure
+++ b/org.glite.px.proxyrenewal/configure
@@ -283,22 +283,23 @@ die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},{
 if ($mode eq 'build') { for my $ext (keys %externs) {
 	if (defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; }
 	elsif (defined $externs{$ext}{pkg}) {
-		my ($prefix, $flag);
+		my ($prefix, $flag, $env);
 		my $pkg = $externs{$ext}{pkg};
 		my $flagname = uc $externs{$ext}{pkg};
 		$flagname =~ s/-[0-9\.]*$//;
 		$flagname =~ s/-/_/g;
 
 		print "Checking $pkg ... ";
-		`pkg-config "$pkg" --exists >/dev/null`;
+		$env = "PKG_CONFIG_PATH=$stagedir$prefix/$libdir/pkgconfig";
+		`$env pkg-config $pkg --exists >/dev/null`;
 		if ($? == 0) {
-			$externs{$ext}{prefix}=`pkg-config $pkg --variable=prefix`;
+			$externs{$ext}{prefix}=`$env pkg-config $pkg --variable=prefix`;
 			chomp $externs{$ext}{prefix};
 			print "$externs{$ext}{prefix}\n";
 
-			$flag=`pkg-config $pkg --cflags`;
+			$flag=`$env pkg-config $pkg --cflags`;
 			$externs{$ext}{flags} .= "${flagname}_CFLAGS=$flag" if ($flag);
-			$flag=`pkg-config $pkg --libs`;
+			$flag=`$env pkg-config $pkg --libs`;
 			$externs{$ext}{flags} .= "${flagname}_LIBS=$flag" if ($flag);
 		} else {
 			print "(using default $externs{$ext}{prefix})\n";