[Benson-commit] CVS: benson3 configure,1.55,1.56 configure.ac,1.4,1.5

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv29651

Modified Files:
	configure configure.ac 
Log Message:
More compile changes

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** configure	30 Sep 2003 04:32:06 -0000	1.55
--- configure	30 Sep 2003 04:43:38 -0000	1.56
***************
*** 309,313 ****
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
--- 309,313 ----
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 5488,5491 ****
--- 5488,5492 ----
  _ACEOF
  
+ 		LD_SEARCH_FLAG="-rpath"
  	fi
  	if test X"$UNAME" = XLinux; then
***************
*** 5496,5501 ****
--- 5497,5504 ----
  
  		CONF_DLFLAGS=-rdynamic
+ 		LD_SEARCH_FLAG="-rpath"
  	fi
  
+ 
  cat >>confdefs.h <<_ACEOF
  #define TARGETOSNAME $UNAME
***************
*** 6363,6366 ****
--- 6366,6370 ----
  s,@CONF_PIC@,$CONF_PIC,;t t
  s,@EGREP@,$EGREP,;t t
+ s,@LD_SEARCH_FLAG@,$LD_SEARCH_FLAG,;t t
  s,@perlpath@,$perlpath,;t t
  s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t

Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** configure.ac	30 Sep 2003 04:32:07 -0000	1.4
--- configure.ac	30 Sep 2003 04:43:38 -0000	1.5
***************
*** 102,110 ****
--- 102,113 ----
  	if test X"$UNAME" = XSunOS; then
  		AC_DEFINE_UNQUOTED(SUNOS, 1, "We're running solaris")
+ 		LD_SEARCH_FLAG="-rpath"
  	fi
  	if test X"$UNAME" = XLinux; then
  		AC_DEFINE_UNQUOTED(LINUX, 1, "We're running linux")
  		CONF_DLFLAGS=-rdynamic
+ 		LD_SEARCH_FLAG="-rpath"
  	fi
+ 	AC_SUBST(LD_SEARCH_FLAG)
  	AC_DEFINE_UNQUOTED(TARGETOSNAME, $UNAME, "Operating System Name")
  fi