[Expat-checkins] CVS: expat configure.in,1.24,1.25

Fred L. Drake fdrake@users.sourceforge.net
Thu Nov 8 20:20:02 2001


Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv18258

Modified Files:
	configure.in 
Log Message:
Be more careful about deciding which filemap implementation to use for
xmlwf.  Part of SF patch #465018.

Only add the -fexceptions option when the version of GCC we're using
actually supports it.  This relates to & partially solves SF bug #445893;
see also SF bug #419585 for why the option was originally added.


Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** configure.in	2001/08/23 13:26:37	1.24
--- configure.in	2001/11/09 04:19:01	1.25
***************
*** 47,55 ****
  
  if test "$GCC" = yes ; then
!     CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions"
  fi
  
- dnl Checks for libraries.
- 
  dnl Checks for header files.
  AC_HEADER_STDC
--- 47,63 ----
  
  if test "$GCC" = yes ; then
!     dnl
!     dnl Be careful about adding the -fexceptions option; some versions of
!     dnl don't support it and it causes extra warnings that are only
!     dnl distracting; avoid.
!     dnl
!     OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
!     CFLAGS="$OLDCFLAGS -fexceptions"
!     AC_MSG_CHECKING(whether gcc accepts -fexceptions)
!     AC_TRY_COMPILE(,(void)1,
!                    AC_MSG_RESULT(yes),
!                    AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS")
  fi
  
  dnl Checks for header files.
  AC_HEADER_STDC
***************
*** 71,75 ****
  AC_FUNC_MMAP
  
! if test -z "$HAVE_MMAP"; then
      FILEMAP_OBJ=unixfilemap.o
  else
--- 79,83 ----
  AC_FUNC_MMAP
  
! if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
      FILEMAP_OBJ=unixfilemap.o
  else