[Python-checkins] python/dist/src configure,1.349,1.350 configure.in,1.360,1.361

loewis@users.sourceforge.net loewis@users.sourceforge.net
Tue, 29 Oct 2002 02:07:46 -0800


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv12384

Modified Files:
	configure configure.in 
Log Message:
Patch #629426: Eliminate more autoconf warnings. Use AC_HELP_STRING.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.349
retrieving revision 1.350
diff -C2 -d -r1.349 -r1.350
*** configure	26 Oct 2002 13:47:43 -0000	1.349
--- configure	29 Oct 2002 10:07:39 -0000	1.350
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.359 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.360 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 826,858 ****
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
!   --enable-framework=INSTALLDIR Build (MacOSX|Darwin) framework
!   --enable-shared                 disable/enable building shared python library
!   --enable-toolbox-glue            disable/enable MacOSX glue code for extensions
!   --enable-ipv6                   Enable ipv6 (with ipv4) support
!   --disable-ipv6                  Disable ipv6 support
!   --enable-unicode=ucs2,ucs4    Enable Unicode strings (default is yes)
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
!   --without-gcc                   never use gcc
!   --with-cxx=<compiler>           enable C++ support
!   --with-suffix=.exe              set executable suffix
!   --with-pydebug                  build with Py_DEBUG defined
!   --with-libs='lib1 ...'          link against additional libs
!   --with-signal-module            disable/enable signal module
!   --with-dec-threads              use DEC Alpha/OSF1 thread-safe libraries
!   --with(out)-threads=DIRECTORY disable/enable thread support
!   --with(out)-thread=DIRECTORY  deprecated; use --with(out)-threads
!   --with-pth                      use GNU pth threading libraries
!   --with(out)-universal-newlines            disable/enable foreign newlines
!   --with(out)-doc-strings         disable/enable documentation strings
!   --with(out)-pymalloc            disable/enable specialized mallocs
!   --with-wctype-functions         use wctype.h functions
!   --with-sgi-dl=DIRECTORY         IRIX 4 dynamic linking
!   --with-dl-dld=DL_DIR,DLD_DIR    GNU dynamic linking
!   --with-fpectl                   enable SIGFPE catching
!   --with-libm=STRING              math library
!   --with-libc=STRING              C library
  
  Some influential environment variables:
--- 826,863 ----
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
!   --enable-framework[=INSTALLDIR]
!                           Build (MacOSX|Darwin) framework
!   --enable-shared         disable/enable building shared python library
!   --enable-toolbox-glue   disable/enable MacOSX glue code for extensions
!   --enable-ipv6           Enable ipv6 (with ipv4) support
!   --disable-ipv6          Disable ipv6 support
!   --enable-unicode[=ucs[24]]
!                           Enable Unicode strings (default is yes)
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
!   --without-gcc           never use gcc
!   --with-cxx=<compiler>   enable C++ support
!   --with-suffix=.exe      set executable suffix
!   --with-pydebug          build with Py_DEBUG defined
!   --with-libs='lib1 ...'  link against additional libs
!   --with-signal-module    disable/enable signal module
!   --with-dec-threads      use DEC Alpha/OSF1 thread-safe libraries
!   --with(out)-threads[=DIRECTORY]
!                           disable/enable thread support
!   --with(out)-thread[=DIRECTORY]
!                           deprecated; use --with(out)-threads
!   --with-pth              use GNU pth threading libraries
!   --with(out)-universal-newlines
!                           disable/enable foreign newlines
!   --with(out)-doc-strings disable/enable documentation strings
!   --with(out)-pymalloc    disable/enable specialized mallocs
!   --with-wctype-functions use wctype.h functions
!   --with-sgi-dl=DIRECTORY IRIX 4 dynamic linking
!   --with-dl-dld=DL_DIR    GNU dynamic linking
!   --with-fpectl           enable SIGFPE catching
!   --with-libm=STRING      math library
!   --with-libc=STRING      C library
  
  Some influential environment variables:
***************
*** 1274,1278 ****
  CONFIG_ARGS="$ac_configure_args"
  
- 
  # Check whether --enable-framework or --disable-framework was given.
  if test "${enable_framework+set}" = set; then
--- 1279,1282 ----
***************
*** 1314,1318 ****
  
  ##AC_ARG_WITH(dyld,
! ##[  --with-dyld                     Use (OpenStep|Rhapsody) dynamic linker],,)
  ##
  # Set name for machine-dependent library files
--- 1318,1323 ----
  
  ##AC_ARG_WITH(dyld,
! ##            AC_HELP_STRING(--with-dyld,
! ##                           Use (OpenStep|Rhapsody) dynamic linker))
  ##
  # Set name for machine-dependent library files
***************
*** 9887,9891 ****
  fi;
  
! # Determine isignalmodule should be used.
  
  
--- 9892,9896 ----
  fi;
  
! # Determine if signalmodule should be used.
  
  
***************
*** 9959,9964 ****
  if test "${with_thread+set}" = set; then
    withval="$with_thread"
! 
! with_threads=$with_thread
  fi;
  
--- 9964,9968 ----
  if test "${with_thread+set}" = set; then
    withval="$with_thread"
!   with_threads=$with_thread
  fi;
  
***************
*** 10274,10281 ****
  if test "${with_pth+set}" = set; then
    withval="$with_pth"
! 
!     echo "$as_me:$LINENO: result: $withval" >&5
  echo "${ECHO_T}$withval" >&6
!     cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
--- 10278,10284 ----
  if test "${with_pth+set}" = set; then
    withval="$with_pth"
!   echo "$as_me:$LINENO: result: $withval" >&5
  echo "${ECHO_T}$withval" >&6
!                   cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
***************
*** 10286,10294 ****
  _ACEOF
  
!     LIBS="-lpth $LIBS"
!     THREADOBJ="Python/thread.o"
  else
! 
!     echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  
--- 10289,10296 ----
  _ACEOF
  
!                   LIBS="-lpth $LIBS"
!                   THREADOBJ="Python/thread.o"
  else
!   echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  
***************
*** 11744,11750 ****
  if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
  then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
! else { { echo "$as_me:$LINENO: error: proper usage is --with-dl-dld=DL_DIRECTORY" >&5
! echo "$as_me: error: proper usage is --with-dl-dld=DL_DIRECTORY" >&2;}
!    { (exit DLD_DIRECTORY); exit DLD_DIRECTORY; }; }
  fi
  DLINCLDIR=${dldir}
--- 11746,11752 ----
  if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
  then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
! else { { echo "$as_me:$LINENO: error: proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY" >&5
! echo "$as_me: error: proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY" >&2;}
!    { (exit 1); exit 1; }; }
  fi
  DLINCLDIR=${dldir}

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.360
retrieving revision 1.361
diff -C2 -d -r1.360 -r1.361
*** configure.in	26 Oct 2002 13:47:44 -0000	1.360
--- configure.in	29 Oct 2002 10:07:43 -0000	1.361
***************
*** 49,55 ****
  CONFIG_ARGS="$ac_configure_args"
  
! 
  AC_ARG_ENABLE(framework,
! [  --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[
  	case $enableval in
  	yes) 
--- 49,56 ----
  CONFIG_ARGS="$ac_configure_args"
  
! dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
  AC_ARG_ENABLE(framework,
!               AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework),
! [
  	case $enableval in
  	yes) 
***************
*** 84,88 ****
  
  ##AC_ARG_WITH(dyld,
! ##[  --with-dyld                     Use (OpenStep|Rhapsody) dynamic linker],,)
  ##
  # Set name for machine-dependent library files
--- 85,90 ----
  
  ##AC_ARG_WITH(dyld,
! ##            AC_HELP_STRING(--with-dyld,
! ##                           Use (OpenStep|Rhapsody) dynamic linker))
  ##
  # Set name for machine-dependent library files
***************
*** 132,136 ****
  # checks for alternative programs
  AC_MSG_CHECKING(for --without-gcc)
! AC_ARG_WITH(gcc, [  --without-gcc                   never use gcc], [
  	case $withval in
  	no)	CC=cc
--- 134,140 ----
  # checks for alternative programs
  AC_MSG_CHECKING(for --without-gcc)
! AC_ARG_WITH(gcc,
!             AC_HELP_STRING(--without-gcc,never use gcc),
! [
  	case $withval in
  	no)	CC=cc
***************
*** 158,162 ****
  			;;
  		*)
! 			AC_ERROR(Unknown BeOS platform \"$BE_HOST_CPU\")
  			;;
  		esac
--- 162,166 ----
  			;;
  		*)
! 			AC_MSG_ERROR([Unknown BeOS platform "$BE_HOST_CPU"])
  			;;
  		esac
***************
*** 175,179 ****
  MAINOBJ=python.o
  AC_MSG_CHECKING(for --with-cxx=<compiler>)
! AC_ARG_WITH(cxx, [  --with-cxx=<compiler>           enable C++ support],[
  	check_cxx=no
  	case $withval in
--- 179,185 ----
  MAINOBJ=python.o
  AC_MSG_CHECKING(for --with-cxx=<compiler>)
! AC_ARG_WITH(cxx,
!             AC_HELP_STRING(--with-cxx=<compiler>, enable C++ support),
! [
  	check_cxx=no
  	case $withval in
***************
*** 191,195 ****
  if test "$with_cxx" = "yes"
  then
! 	AC_ERROR(must supply a compiler when using --with-cxx)
  fi
  
--- 197,201 ----
  if test "$with_cxx" = "yes"
  then
! 	AC_MSG_ERROR([must supply a compiler when using --with-cxx])
  fi
  
***************
*** 222,227 ****
  if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
  then
!   AC_ERROR(cached CC is different -- throw away $cache_file
! (it is also a good idea to do 'make clean' before compiling))
  fi
  
--- 228,233 ----
  if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
  then
!   AC_MSG_ERROR([cached CC is different -- throw away $cache_file
! (it is also a good idea to do 'make clean' before compiling)])
  fi
  
***************
*** 234,238 ****
  AC_EXEEXT
  AC_MSG_CHECKING(for --with-suffix)
! AC_ARG_WITH(suffix, [  --with-suffix=.exe              set executable suffix],[
  	case $withval in
  	no)	EXEEXT=;;
--- 240,246 ----
  AC_EXEEXT
  AC_MSG_CHECKING(for --with-suffix)
! AC_ARG_WITH(suffix,
!             AC_HELP_STRING(--with-suffix=.exe, set executable suffix),
! [
  	case $withval in
  	no)	EXEEXT=;;
***************
*** 349,353 ****
  AC_MSG_CHECKING(for --enable-shared)
  AC_ARG_ENABLE(shared,
! [  --enable-shared                 disable/enable building shared python library])
  
  if test -z "$enable_shared"
--- 357,361 ----
  AC_MSG_CHECKING(for --enable-shared)
  AC_ARG_ENABLE(shared,
!               AC_HELP_STRING(--enable-shared, disable/enable building shared python library))
  
  if test -z "$enable_shared"
***************
*** 457,461 ****
  AC_MSG_CHECKING(for --with-pydebug)
  AC_ARG_WITH(pydebug, 
! [  --with-pydebug                  build with Py_DEBUG defined], [
  if test "$withval" != no
  then 
--- 465,470 ----
  AC_MSG_CHECKING(for --with-pydebug)
  AC_ARG_WITH(pydebug, 
!             AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined),
! [
  if test "$withval" != no
  then 
***************
*** 831,835 ****
  AC_MSG_CHECKING(for --enable-toolbox-glue)
  AC_ARG_ENABLE(toolbox-glue,
! [  --enable-toolbox-glue            disable/enable MacOSX glue code for extensions])
  
  if test -z "$enable_toolbox_glue"
--- 840,844 ----
  AC_MSG_CHECKING(for --enable-toolbox-glue)
  AC_ARG_ENABLE(toolbox-glue,
!               AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions))
  
  if test -z "$enable_toolbox_glue"
***************
*** 1140,1147 ****
  AC_MSG_CHECKING(for --with-libs)
  AC_ARG_WITH(libs,
! [  --with-libs='lib1 ...'          link against additional libs], [
  AC_MSG_RESULT($withval)
  LIBS="$withval $LIBS"
! ], AC_MSG_RESULT(no))
  
  # Determine if signalmodule should be used.
--- 1149,1158 ----
  AC_MSG_CHECKING(for --with-libs)
  AC_ARG_WITH(libs,
!             AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs),
! [
  AC_MSG_RESULT($withval)
  LIBS="$withval $LIBS"
! ],
! [AC_MSG_RESULT(no)])
  
  # Determine if signalmodule should be used.
***************
*** 1150,1154 ****
  AC_MSG_CHECKING(for --with-signal-module)
  AC_ARG_WITH(signal-module,
! [  --with-signal-module            disable/enable signal module])
  
  if test -z "$with_signal_module"
--- 1161,1165 ----
  AC_MSG_CHECKING(for --with-signal-module)
  AC_ARG_WITH(signal-module,
!             AC_HELP_STRING(--with-signal-module, disable/enable signal module))
  
  if test -z "$with_signal_module"
***************
*** 1172,1176 ****
  AC_SUBST(LDLAST)
  AC_ARG_WITH(dec-threads,
! [  --with-dec-threads              use DEC Alpha/OSF1 thread-safe libraries], [
  AC_MSG_RESULT($withval)
  LDLAST=-threads
--- 1183,1188 ----
  AC_SUBST(LDLAST)
  AC_ARG_WITH(dec-threads,
!             AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries),
! [
  AC_MSG_RESULT($withval)
  LDLAST=-threads
***************
*** 1178,1182 ****
     with_thread="$withval";
  fi],
! AC_MSG_RESULT(no))
  
  # Templates for things AC_DEFINEd more than once.
--- 1190,1194 ----
     with_thread="$withval";
  fi],
! [AC_MSG_RESULT(no)])
  
  # Templates for things AC_DEFINEd more than once.
***************
*** 1189,1199 ****
  
  AC_MSG_CHECKING(for --with-threads)
  AC_ARG_WITH(threads,
! [  --with(out)-threads[=DIRECTORY] disable/enable thread support])
  
  # --with-thread is deprecated, but check for it anyway
  AC_ARG_WITH(thread,
! [  --with(out)-thread[=DIRECTORY]  deprecated; use --with(out)-threads],[
! with_threads=$with_thread])
  
  if test -z "$with_threads"
--- 1201,1213 ----
  
  AC_MSG_CHECKING(for --with-threads)
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
  AC_ARG_WITH(threads,
!             AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support))
  
  # --with-thread is deprecated, but check for it anyway
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
  AC_ARG_WITH(thread,
!             AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads),
!             [with_threads=$with_thread])
  
  if test -z "$with_threads"
***************
*** 1251,1262 ****
      THREADOBJ="Python/thread.o"],[
      AC_MSG_CHECKING(for --with-pth)
!     AC_ARG_WITH(pth,
!     [  --with-pth                      use GNU pth threading libraries], [
!     AC_MSG_RESULT($withval)
!     AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(HAVE_PTH, 1, [Define if you have GNU PTH threads.])
!     LIBS="-lpth $LIBS"
!     THREADOBJ="Python/thread.o"],[
!     AC_MSG_RESULT(no)
  
      # Just looking for pthread_create in libpthread is not enough:
--- 1265,1277 ----
      THREADOBJ="Python/thread.o"],[
      AC_MSG_CHECKING(for --with-pth)
!     AC_ARG_WITH([pth],
!                 AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
!                 [AC_MSG_RESULT($withval)
!                   AC_DEFINE([WITH_THREAD])
!                   AC_DEFINE([HAVE_PTH], 1,
!                             [Define if you have GNU PTH threads.])
!                   LIBS="-lpth $LIBS"
!                   THREADOBJ="Python/thread.o"],
! 	        [AC_MSG_RESULT(no)
  
      # Just looking for pthread_create in libpthread is not enough:
***************
*** 1375,1380 ****
  AC_MSG_CHECKING([if --enable-ipv6 is specified])
  AC_ARG_ENABLE(ipv6,
! [  --enable-ipv6                   Enable ipv6 (with ipv4) support
!   --disable-ipv6                  Disable ipv6 support],
  [ case "$enableval" in
    no)
--- 1390,1395 ----
  AC_MSG_CHECKING([if --enable-ipv6 is specified])
  AC_ARG_ENABLE(ipv6,
! [  --enable-ipv6           Enable ipv6 (with ipv4) support
!   --disable-ipv6          Disable ipv6 support],
  [ case "$enableval" in
    no)
***************
*** 1541,1545 ****
  AC_MSG_CHECKING(for --with-universal-newlines)
  AC_ARG_WITH(universal-newlines,
! [  --with(out)-universal-newlines            disable/enable foreign newlines])
  
  if test -z "$with_universal_newlines"
--- 1556,1560 ----
  AC_MSG_CHECKING(for --with-universal-newlines)
  AC_ARG_WITH(universal-newlines,
!             AC_HELP_STRING(--with(out)-universal-newlines, disable/enable foreign newlines))
  
  if test -z "$with_universal_newlines"
***************
*** 1556,1560 ****
  AC_MSG_CHECKING(for --with-doc-strings)
  AC_ARG_WITH(doc-strings,
! [  --with(out)-doc-strings         disable/enable documentation strings])
  
  if test -z "$with_doc_strings"
--- 1571,1575 ----
  AC_MSG_CHECKING(for --with-doc-strings)
  AC_ARG_WITH(doc-strings,
!             AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings))
  
  if test -z "$with_doc_strings"
***************
*** 1571,1575 ****
  AC_MSG_CHECKING(for --with-pymalloc)
  AC_ARG_WITH(pymalloc,
! [  --with(out)-pymalloc            disable/enable specialized mallocs])
  
  if test -z "$with_pymalloc"
--- 1586,1590 ----
  AC_MSG_CHECKING(for --with-pymalloc)
  AC_ARG_WITH(pymalloc,
!             AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs))
  
  if test -z "$with_pymalloc"
***************
*** 1586,1590 ****
  AC_MSG_CHECKING(for --with-wctype-functions)
  AC_ARG_WITH(wctype-functions, 
! [  --with-wctype-functions         use wctype.h functions], [
  if test "$withval" != no
  then 
--- 1601,1606 ----
  AC_MSG_CHECKING(for --with-wctype-functions)
  AC_ARG_WITH(wctype-functions, 
!             AC_HELP_STRING(--with-wctype-functions, use wctype.h functions),
! [
  if test "$withval" != no
  then 
***************
*** 1603,1607 ****
  AC_MSG_CHECKING(for --with-sgi-dl)
  AC_ARG_WITH(sgi-dl,
! [  --with-sgi-dl=DIRECTORY         IRIX 4 dynamic linking], [
  AC_MSG_RESULT($withval)
  AC_DEFINE(WITH_SGI_DL, 1,
--- 1619,1624 ----
  AC_MSG_CHECKING(for --with-sgi-dl)
  AC_ARG_WITH(sgi-dl,
!             AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking),
! [
  AC_MSG_RESULT($withval)
  AC_DEFINE(WITH_SGI_DL, 1,
***************
*** 1615,1619 ****
  if test ! -z "$dldir" -a -d "$dldir"
  then LDFLAGS="$LDFLAGS -L$dldir"
! else AC_ERROR(proper usage is --with-sgi-dl=DIRECTORY)
  fi
  DLINCLDIR=${dldir}
--- 1632,1636 ----
  if test ! -z "$dldir" -a -d "$dldir"
  then LDFLAGS="$LDFLAGS -L$dldir"
! else AC_MSG_ERROR([proper usage is --with-sgi-dl=DIRECTORY])
  fi
  DLINCLDIR=${dldir}
***************
*** 1621,1625 ****
  
  AC_MSG_CHECKING(for --with-dl-dld)
! AC_ARG_WITH(dl-dld, [  --with-dl-dld=DL_DIR,DLD_DIR    GNU dynamic linking], [
  AC_MSG_RESULT($withval)
  AC_DEFINE(WITH_DL_DLD, 1, 
--- 1638,1644 ----
  
  AC_MSG_CHECKING(for --with-dl-dld)
! AC_ARG_WITH(dl-dld,
!             AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking),
! [
  AC_MSG_RESULT($withval)
  AC_DEFINE(WITH_DL_DLD, 1, 
***************
*** 1638,1642 ****
  if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
  then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
! else AC_ERROR(proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY)
  fi
  DLINCLDIR=${dldir}
--- 1657,1661 ----
  if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
  then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
! else AC_MSG_ERROR([proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY])
  fi
  DLINCLDIR=${dldir}
***************
*** 2094,2098 ****
  AC_MSG_CHECKING(for --with-fpectl)
  AC_ARG_WITH(fpectl,
! [  --with-fpectl                   enable SIGFPE catching], [
  if test "$withval" != no
  then 
--- 2113,2118 ----
  AC_MSG_CHECKING(for --with-fpectl)
  AC_ARG_WITH(fpectl,
!             AC_HELP_STRING(--with-fpectl, enable SIGFPE catching),
! [
  if test "$withval" != no
  then 
***************
*** 2112,2116 ****
  esac
  AC_MSG_CHECKING(for --with-libm=STRING)
! AC_ARG_WITH(libm, [  --with-libm=STRING              math library], [
  if test "$withval" = no
  then LIBM=
--- 2132,2138 ----
  esac
  AC_MSG_CHECKING(for --with-libm=STRING)
! AC_ARG_WITH(libm,
!             AC_HELP_STRING(--with-libm=STRING, math library),
! [
  if test "$withval" = no
  then LIBM=
***************
*** 2118,2130 ****
  elif test "$withval" != yes
  then LIBM=$withval
!      AC_MSG_RESULT(set LIBM=\"$withval\")
! else AC_ERROR(proper usage is --with-libm=STRING)
  fi],
! [AC_MSG_RESULT(default LIBM=\"$LIBM\")])
  
  # check for --with-libc=...
  AC_SUBST(LIBC)
  AC_MSG_CHECKING(for --with-libc=STRING)
! AC_ARG_WITH(libc, [  --with-libc=STRING              C library], [
  if test "$withval" = no
  then LIBC=
--- 2140,2154 ----
  elif test "$withval" != yes
  then LIBM=$withval
!      AC_MSG_RESULT(set LIBM="$withval")
! else AC_MSG_ERROR([proper usage is --with-libm=STRING])
  fi],
! [AC_MSG_RESULT(default LIBM="$LIBM")])
  
  # check for --with-libc=...
  AC_SUBST(LIBC)
  AC_MSG_CHECKING(for --with-libc=STRING)
! AC_ARG_WITH(libc,
!             AC_HELP_STRING(--with-libc=STRING, C library),
! [
  if test "$withval" = no
  then LIBC=
***************
*** 2132,2139 ****
  elif test "$withval" != yes
  then LIBC=$withval
!      AC_MSG_RESULT(set LIBC=\"$withval\")
! else AC_ERROR(proper usage is --with-libc=STRING)
  fi],
! [AC_MSG_RESULT(default LIBC=\"$LIBC\")])
  
  # check for hypot() in math library
--- 2156,2163 ----
  elif test "$withval" != yes
  then LIBC=$withval
!      AC_MSG_RESULT(set LIBC="$withval")
! else AC_MSG_ERROR([proper usage is --with-libc=STRING])
  fi],
! [AC_MSG_RESULT(default LIBC="$LIBC")])
  
  # check for hypot() in math library
***************
*** 2188,2193 ****
  
  AC_MSG_CHECKING(what type to use for unicode)
  AC_ARG_ENABLE(unicode, 
! [  --enable-unicode[=ucs2,ucs4]    Enable Unicode strings (default is yes)],,enable_unicode=yes)
  
  if test $enable_unicode = yes
--- 2212,2220 ----
  
  AC_MSG_CHECKING(what type to use for unicode)
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
  AC_ARG_ENABLE(unicode, 
!               AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)),
!               [],
!               [enable_unicode=yes])
  
  if test $enable_unicode = yes