From d4c1e426b9d0664835b5c06ad71f6c811c2f8173 Mon Sep 17 00:00:00 2001
From: Elisabetta Ronchieri <elisabetta.ronchieri@cnaf.infn.it>
Date: Mon, 14 Jun 2004 18:14:35 +0000
Subject: [PATCH] Added Configure options WARNING work in progress

---
 org.glite.wms-utils.jobid/build.xml             | 19 +++++++---
 org.glite.wms-utils.jobid/configure.ac          | 49 ++++---------------------
 org.glite.wms-utils.jobid/src/jobid/Makefile.am |  4 +-
 org.glite.wms-utils.jobid/src/jobid/strmd5.c    |  2 +-
 org.glite.wms-utils.jobid/test/Makefile.am      |  9 ++---
 org.glite.wms-utils.jobid/test/testjobid.c      |  2 +-
 6 files changed, 29 insertions(+), 56 deletions(-)

diff --git a/org.glite.wms-utils.jobid/build.xml b/org.glite.wms-utils.jobid/build.xml
index 38068b0..c780eca 100755
--- a/org.glite.wms-utils.jobid/build.xml
+++ b/org.glite.wms-utils.jobid/build.xml
@@ -21,6 +21,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.1.1.1  2004/05/26 18:45:05  eronchie
+	Import of wms jobid
+	
 
 -->
 
@@ -65,12 +68,18 @@
 		 ========================================= -->
 	<import file="${subsystem.taskdefs.file}" />
 	<import file="${global.taskdefs.file}" />
-			
+	
 	<!-- =========================================
-		 Load common targets
-		 ========================================= -->
-	<import file="${global.targets-external-dependencies.file}"/>	
-	<import file="${global.targets-make.file}" />
+                 Load configure options
+                 ========================================= -->
+        <property file="${global.configure.options.file}"/>
+                                                                               
+        <!-- =========================================
+                 Load common targets
+                 ========================================= -->
+        <import file="${global.targets-external-dependencies.file}"/>
+        <import file="${global.targets-make.file}" />
+        <import file="${component.configure.options.file}"/>		
 		
 	<!-- =========================================
 		 Load version file 
diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac
index f28a384..9acfaa3 100755
--- a/org.glite.wms-utils.jobid/configure.ac
+++ b/org.glite.wms-utils.jobid/configure.ac
@@ -19,6 +19,10 @@
 #
 #       Revision history:
 #       $Log$
+#       Revision 1.3  2004/06/01 13:52:35  eronchie
+#       Updated namespace for jobid.
+#       Changed glite::wms::common::jobid namespace in glite::wms::jobid
+#
 #       Revision 1.2  2004/05/31 14:03:30  eronchie
 #       Merged with code in the infnforge repository
 #
@@ -46,58 +50,21 @@ AC_REVISION([$Revision$])
 WORKDIR=`pwd`
 AC_SUBST(WORKDIR)
 
-REPOSITORY=$WORKDIR/../../repository
 STAGE=$WORKDIR/../../stage
 
 DISTBIN=$WORKDIR/../../dist
 AC_SUBST(DISTBIN)
 
-BOOST_CFLAGS=-I$REPOSITORY/boost/1.29.1/rhel30_gcc32/include
-AC_SUBST([BOOST_CFLAGS])
-BOOST_CPPFLAGS=$BOOST_CFLAGS
-AC_SUBST([BOOST_CPPFLAGS])
-BOOST_LIBS="-L$REPOSITORY/boost/1.29.1/rhel30_gcc32/lib/release -lboost_fs -lboost_thread -lpthread -lboost_regex -lc"
-AC_SUBST([BOOST_LIBS])
-
-CLASSAD_CFLAGS=-I$REPOSITORY/classads/0.9.5/rhel30_gcc32/include
-AC_SUBST([CLASSAD_CFLAGS])
-CLASSAD_CPPFLAGS=$CLASSAD_CFLAGS
-AC_SUBST([CLASSAD_CPPFLAGS])
-CLASSAD_LIBS="-L$REPOSITORY/classads/0.9.5/rhel30_gcc32/lib -lclassad"
-AC_SUBST([CLASSAD_LIBS])
-
-GLOBUS_SSL_UTILS_CFLAGS="-I$STAGE/include"
-AC_SUBST([GLOBUS_SSL_UTILS_CFLAGS])
-#GLOBUS_SSL_UTILS_LIBS="-L$STAGE/lib -lglobus_ssl_utils"
-#AC_SUBST([GLOBUS_SSL_UTILS_LIBS])
+have_globus=no
+                                                                               
+AC_GLOBUS([], have_globus=yes, have_globus=no)
+AC_MSG_RESULT(["GLOBUS found $have_globus"])
 
 GLITE_WORKLOAD_CFLAGS="-I$STAGE/include"
 AC_SUBST([GLITE_WORKLOAD_CFLAGS])
 GLITE_WORKLOAD_COMMON_LIBS="-L$STAGE/lib -lglite_wms_exceptions"
 AC_SUBST([GLITE_WORKLOAD_COMMON_LIBS])
 
-GLOBUS_COMMON_NOTHR_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lglobus_common_gcc32"
-AC_SUBST([GLOBUS_COMMON_NOTHR_LIBS])
-GLOBUS_COMMON_THR_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lglobus_common_gcc32pthr"
-AC_SUBST([GLOBUS_COMMON_THR_LIBS])
-
-GLOBUS_FTP_CLIENT_NOTHR_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lglobus_ftp_client_gcc32"
-AC_SUBST([GLOBUS_FTP_CLIENT_NOTHR_LIBS])
-GLOBUS_FTP_CLIENT_THR_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lglobus_ftp_client_gcc32pthr"
-AC_SUBST([GLOBUS_FTP_CLIENT_THR_LIBS])
- 
-GLOBUS_SSL_NOTHR_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lssl_gcc32 -lcrypto_gcc32"
-AC_SUBST([GLOBUS_SSL_NOTHR_LIBS])
-GLOBUS_SSL_THR_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lssl_gcc32pthr -lcrypto_gcc32pthr"
-AC_SUBST([GLOBUS_SSL_THR_LIBS])
-
-GLOBUS_CFLAGS=-I$REPOSITORY/globus/2.4.3/rhel30_gcc32/include/gcc32
-AC_SUBST([GLOBUS_CFLAGS])
-GLOBUS_CPPFLAGS=$GLOBUS_CFLAGS
-AC_SUBST([GLOBUS_CPPFLAGS])
-GLOBUS_LIBS="-L$REPOSITORY/globus/2.4.3/rhel30_gcc32/lib -lglobus_gass_copy_gcc32 -lglobus_ftp_client_gcc32 -lglobus_gass_transfer_gcc32 -lglobus_ftp_control_gcc32 -lglobus_io_gcc32 -lglobus_gss_assist_gcc32 -lglobus_gssapi_gsi_gcc32 -lglobus_gsi_proxy_core_gcc32 -lglobus_gsi_credential_gcc32 -lglobus_gsi_callback_gcc32 -lglobus_oldgaa_gcc32 -lglobus_gsi_sysconfig_gcc32 -lglobus_gsi_cert_utils_gcc32 -lglobus_openssl_error_gcc32 -lglobus_openssl_gcc32 -lglobus_proxy_ssl_gcc32 -lssl_gcc32 -lcrypto_gcc32 -lglobus_common_gcc32"
-AC_SUBST([GLOBUS_LIBS])
-
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
index 5f7bde8..48e3cd4 100755
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
@@ -23,11 +23,9 @@ jobidinclude_HEADERS = \
 	manipulation.h \
 	strmd5.h 
 
-AM_CPPFLAGS = -I$(top_srcdir)/.. \
+AM_CPPFLAGS = -I$(top_srcdir)/src \
 	$(GLITE_WORKLOAD_CFLAGS) \
 	$(GLITE_WORKLOAD_CFLAGS)/glite/wms/common \
-	$(GLOBUS_CFLAGS) \
-	$(BOOST_CFLAGS) \
 	-D_GNU_SOURCE
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/org.glite.wms-utils.jobid/src/jobid/strmd5.c b/org.glite.wms-utils.jobid/src/jobid/strmd5.c
index cec7ef5..0433f55 100755
--- a/org.glite.wms-utils.jobid/src/jobid/strmd5.c
+++ b/org.glite.wms-utils.jobid/src/jobid/strmd5.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../jobid/strmd5.h"
+#include "jobid/strmd5.h"
 
 #warning Thread unsafe!
 static char mbuf[33];
diff --git a/org.glite.wms-utils.jobid/test/Makefile.am b/org.glite.wms-utils.jobid/test/Makefile.am
index 93909e7..c7edb6e 100755
--- a/org.glite.wms-utils.jobid/test/Makefile.am
+++ b/org.glite.wms-utils.jobid/test/Makefile.am
@@ -16,14 +16,13 @@ testjobid_SOURCES = testjobid.c
 testjobid_LDADD = \
 	$(JOBID) \
 	$(GLITE_WORKLOAD_COMMON_LIBS) \
-	$(GLOBUS_LIBS) \
+	$(GLOBUS_SSL_THR_LIBS) \
 	$(STDCPP)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src \
-	$(BOOST_CFLAGS) \
-	$(CLASSAD_CFLAGS) \
-	$(GLITE_WORKLOAD_COMMON_CFLAGS) \
-	$(GLOBUS_CFLAGS)
+        $(GLITE_WORKLOAD_CFLAGS) \
+        $(GLITE_WORKLOAD_CFLAGS)/glite/wms/common \
+	$(GLITE_THR_CFLAGS)
 
 MAINTAINERCLEANFILES = Makefile.in *~
 
diff --git a/org.glite.wms-utils.jobid/test/testjobid.c b/org.glite.wms-utils.jobid/test/testjobid.c
index 9d9ae32..293304e 100755
--- a/org.glite.wms-utils.jobid/test/testjobid.c
+++ b/org.glite.wms-utils.jobid/test/testjobid.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "cjobid.h"
+#include "jobid/cjobid.h"
 
 int main(int argc, char* argv[])
 {
-- 
1.8.2.3