Added configure options

WARNING: Work in progress

diff --git a/org.glite.wms-utils.jobid/Makefile.am b/org.glite.wms-utils.jobid/Makefile.am
index 8092c63..142eba7 100755 (executable)
--- a/org.glite.wms-utils.jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/Makefile.am
@@ -18,7 +18,7 @@ stage:
        @set fnord $(MAKEFLAGS); amf=$$2; \
        dot_seen=no; \
         target="install"; \
-       prefix_arg="prefix=$(WORKDIR)/../../stage"; \
+       prefix_arg="@prefix@"; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           echo "Making $$target $$prefix_arg in $$subdir"; \
           if test "$$subdir" = "."; then \

diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac
index 9acfaa3..25dc8b6 100755 (executable)
--- 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.4  2004/06/14 18:14:35  eronchie
+#       Added Configure options
+#       WARNING work in progress
+#
 #       Revision 1.3  2004/06/01 13:52:35  eronchie
 #       Updated namespace for jobid.
 #       Changed glite::wms::common::jobid namespace in glite::wms::jobid
@@ -50,21 +54,9 @@ AC_REVISION([$Revision$])
 WORKDIR=`pwd`
 AC_SUBST(WORKDIR)
 
-STAGE=$WORKDIR/../../stage
-
 DISTBIN=$WORKDIR/../../dist
 AC_SUBST(DISTBIN)
-
-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])
-
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -98,6 +90,18 @@ AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([bzero endpwent ftruncate getmntent memset mkdir pow strerror strtol])
 
+have_globus=no
+                                                                                
+AC_GLOBUS([], have_globus=yes, have_globus=no)
+AC_MSG_RESULT(["GLOBUS found $have_globus"])
+
+have_glite_wms_common=no
+                                                                                
+AC_GLITE
+                                                                                
+AC_GLITE_WMS_COMMON([], have_glite_wms_common=yes, have_glite_wms_common=no)
+AC_MSG_RESULT(["GLITE_WMS_COMMON found $have_glite_wms_common"])
+
 # Configuration items
 AC_PREFIX_DEFAULT([/opt/glite])
 AM_CONFIG_HEADER([src/autogen/config.h])

diff --git a/org.glite.wms-utils.jobid/project/configure-options.xml b/org.glite.wms-utils.jobid/project/configure-options.xml
index f135319..6415964 100644 (file)
--- a/org.glite.wms-utils.jobid/project/configure-options.xml
+++ b/org.glite.wms-utils.jobid/project/configure-options.xml
@@ -4,6 +4,6 @@
         
        <project name="configure options">                                                                        
         <property name="configure.args"
-               value="--with-globus-prefix=${with.globus.prefix} --with-globus-thr-flavor=${with.globus.thr.flavor} --with-globus-nothr-flavor=${with.globus.nothr.flavor}"/>
+               value="--prefix=${workspace.abs.dir}/stage --with-globus-prefix=${with.globus.prefix} --with-globus-thr-flavor=${with.globus.thr.flavor} --with-globus-nothr-flavor=${with.globus.nothr.flavor} --with-glite-location=${with.glite.location}"/>
 
        </project>

diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
index 48e3cd4..28d9d56 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
@@ -24,8 +24,8 @@ jobidinclude_HEADERS = \
        strmd5.h 
 
 AM_CPPFLAGS = -I$(top_srcdir)/src \
-       $(GLITE_WORKLOAD_CFLAGS) \
-       $(GLITE_WORKLOAD_CFLAGS)/glite/wms/common \
+       $(GLITE_CFLAGS) \
+       $(GLITE_WMS_COMMON_CFLAGS) \
        -D_GNU_SOURCE
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/org.glite.wms-utils.jobid/test/Makefile.am b/org.glite.wms-utils.jobid/test/Makefile.am
index c7edb6e..b0c2412 100755 (executable)
--- a/org.glite.wms-utils.jobid/test/Makefile.am
+++ b/org.glite.wms-utils.jobid/test/Makefile.am
@@ -15,13 +15,13 @@ check_PROGRAMS = testjobid
 testjobid_SOURCES = testjobid.c
 testjobid_LDADD = \
        $(JOBID) \
-       $(GLITE_WORKLOAD_COMMON_LIBS) \
+       $(GLITE_WMS_COMMON_UT_EXCEPTIONS_LIBS) \
        $(GLOBUS_SSL_THR_LIBS) \
        $(STDCPP)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src \
-        $(GLITE_WORKLOAD_CFLAGS) \
-        $(GLITE_WORKLOAD_CFLAGS)/glite/wms/common \
+        $(GLITE_CFLAGS) \
+        $(GLITE_WMS_COMMON_CFLAGS) \
        $(GLITE_THR_CFLAGS)
 
 MAINTAINERCLEANFILES = Makefile.in *~