[Benson-commit] CVS: benson3 configure,1.62,1.63 configure.ac,1.10,1.11

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

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

Modified Files:
	configure configure.ac 
Log Message:
Added the v32 changes.

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** configure	8 Oct 2003 04:16:37 -0000	1.62
--- configure	8 Nov 2003 21:05:14 -0000	1.63
***************
*** 3241,3245 ****
  
  CONF_LIBNSL=yes
- echo $host_os
  case $host_os in
    *cyg*)
--- 3241,3244 ----
***************
*** 5624,5627 ****
--- 5623,5629 ----
  fi
  
+           ac_config_commands="$ac_config_commands src/tests/atconfig"
+ 
+ 
  
  if test X"$unamepath" != "X"; then
***************
*** 5841,5849 ****
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="$CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="$CFLAGS -pg"
  fi
  
--- 5843,5851 ----
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -pg"
  fi
  
***************
*** 6266,6269 ****
--- 6268,6274 ----
  $config_headers
  
+ Configuration commands:
+ $config_commands
+ 
  Report bugs to <bug...@gn...>."
  _ACEOF
***************
*** 6395,6398 ****
--- 6400,6404 ----
    "doc/htdocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/htdocs/Makefile" ;;
    "doc/htdocs/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/htdocs/images/Makefile" ;;
+   "src/tests/atconfig" ) CONFIG_COMMANDS="$CONFIG_COMMANDS src/tests/atconfig" ;;
    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
***************
*** 6409,6412 ****
--- 6415,6419 ----
    test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
    test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
  fi
  
***************
*** 6949,6952 ****
--- 6956,7038 ----
      rm -f $tmp/config.h
    fi
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ #
+ # CONFIG_COMMANDS section.
+ #
+ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_dest" : 'X\(//\)[^/]' \| \
+          X"$ac_dest" : 'X\(//\)$' \| \
+          X"$ac_dest" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+ 
+   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+ echo "$as_me: executing $ac_dest commands" >&6;}
+   case $ac_dest in
+     src/tests/atconfig ) cat >src/tests/atconfig <<ATEOF
+ # Configurable variable values for building test suites.
+ # Generated by $0.
+ # Copyright 2000, 2001 Free Software Foundation, Inc.
+ 
+ # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
+ at_testdir='src/tests'
+ abs_builddir='$ac_abs_builddir'
+ at_srcdir='$ac_srcdir'
+ abs_srcdir='$ac_abs_srcdir'
+ at_top_srcdir='$ac_top_srcdir'
+ abs_top_srcdir='$ac_abs_top_srcdir'
+ at_top_builddir='$ac_top_builddir'
+ abs_top_builddir='$ac_abs_top_builddir'
+ 
+ AUTOTEST_PATH='src/tests'
+ 
+ SHELL=\${CONFIG_SHELL-'$SHELL'}
+ ATEOF
+  ;;
+   esac
  done
  _ACEOF

Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.ac	8 Oct 2003 04:16:37 -0000	1.10
--- configure.ac	8 Nov 2003 21:05:15 -0000	1.11
***************
*** 26,30 ****
  
  CONF_LIBNSL=yes
- echo $host_os
  case $host_os in
    *cyg*)
--- 26,29 ----
***************
*** 101,104 ****
--- 100,104 ----
  AC_CHECK_LIB(ssl, SSL_library_init)
  AC_CHECK_LIB(expat, XML_Parse)
+ AC_CONFIG_TESTDIR(src/tests)
  
  if test X"$unamepath" != "X"; then
***************
*** 180,188 ****
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="$CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="$CFLAGS -pg"
  fi
  
--- 180,188 ----
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -pg"
  fi