[xio-commit] CVS update: MODIFIED: netlog ...

[John Bresnahan]

  User: bresnaha
  Date: 08/04/08 14:51:40

  Modified:    drivers/netlog Makefile.am configure.in
  Log:
  removed the need for the flag to find netlogger.  no longer needed now
  that it is a package.
  
  Revision  Changes    Path
  1.7       +5 -7      xio/drivers/netlog/Makefile.am
  
  http://viewcvs.globus.org/viewcvs.cgi/xio/drivers/netlog/Makefile.am.diff?r1=1.6&r2=1.7
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/xio/drivers/netlog/Makefile.am,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Makefile.am	19 Dec 2007 22:38:44 -0000	1.6
  +++ Makefile.am	8 Apr 2008 19:51:39 -0000	1.7
  @@ -1,8 +1,6 @@
   include $(top_srcdir)/globus_automake_pre
   include $(top_srcdir)/globus_automake_pre_top
   
  -NETLOGGER_PATH=@NETLOGGER_PATH@
  -
   SUBDIRS = \
   	pkgdata \
   	doxygen
  @@ -10,25 +8,25 @@
   flavorinclude_HEADERS = \
       globus_xio_netlogger.h
   
  -INCLUDES = $(GPT_INCLUDES) -I $(NETLOGGER_PATH)/include
  +INCLUDES = $(GPT_INCLUDES) 
   
   lib_LTLIBRARIES = libglobus_xio_netlogger_driver_$(GLOBUS_FLAVOR_NAME).la \
                  libclient_netlogger_plugin_$(GLOBUS_FLAVOR_NAME).la
   
   libclient_netlogger_plugin___GLOBUS_FLAVOR_NAME__la_LIBADD = \
  -    @GPT_LIB_LINKS@  $(NETLOGGER_PATH)/lib/libnl.a -luuid
  +    @GPT_LIB_LINKS@ 
   libclient_netlogger_plugin___GLOBUS_FLAVOR_NAME__la_SOURCES = \
       globus_ftp_client_nl_plugin.c
   libclient_netlogger_plugin___GLOBUS_FLAVOR_NAME__la_LDFLAGS = \
  -	@GPT_LDFLAGS@ -module -rpath $(GLOBUS_LOCATION)/lib -rpath $(NETLOGGER_PATH)/lib
  +	@GPT_LDFLAGS@ -module -rpath $(GLOBUS_LOCATION)/lib 
   
   
   libglobus_xio_netlogger_driver___GLOBUS_FLAVOR_NAME__la_LIBADD = \
  -	@GPT_LIB_LINKS@ $(NETLOGGER_PATH)/lib/libnl.a -luuid
  +	@GPT_LIB_LINKS@ 
   libglobus_xio_netlogger_driver___GLOBUS_FLAVOR_NAME__la_SOURCES = \
   	globus_xio_netlogger.c
   libglobus_xio_netlogger_driver___GLOBUS_FLAVOR_NAME__la_LDFLAGS = \
  -	@GPT_LDFLAGS@ -module -rpath $(GLOBUS_LOCATION)/lib -rpath $(NETLOGGER_PATH)/lib
  +	@GPT_LDFLAGS@ -module -rpath $(GLOBUS_LOCATION)/lib 
   
   EXTRA_DIST = version.h.in
   
  
  
  
  1.3       +1 -10     xio/drivers/netlog/configure.in
  
  http://viewcvs.globus.org/viewcvs.cgi/xio/drivers/netlog/configure.in.diff?r1=1.2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: configure.in
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/xio/drivers/netlog/configure.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- configure.in	16 Oct 2006 23:42:51 -0000	1.2
  +++ configure.in	8 Apr 2008 19:51:39 -0000	1.3
  @@ -1,6 +1,6 @@
   dnl
   
  -AC_REVISION($Revision: 1.2 $)
  +AC_REVISION($Revision: 1.3 $)
   AC_INIT(Makefile.am)
   
   GLOBUS_INIT
  @@ -14,15 +14,6 @@
   
   LAC_DOXYGEN("../", "", "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
   
  -AC_SUBST( NETLOGGER_PATH)
  -
  -
  -AC_ARG_WITH( netlogger-path,
  -[  --with-netlogger-path=DIR    location of srb ],
  -    CONFIG_NETLOGGER_PATH="${withval}", AC_MSG_ERROR( [must specify netlogger path: --with-netlogger-path] ))
  -
  -NETLOGGER_PATH=${CONFIG_NETLOGGER_PATH}
  -
   GLOBUS_FINALIZE
   
   AC_OUTPUT(