[Emacs-diffs] Changes to emacs/gc/configure.in [Boehm-GC]

[Dave Love]

Index: emacs/gc/configure.in
diff -c emacs/gc/configure.in:1.2.2.2 emacs/gc/configure.in:1.2.2.3
*** emacs/gc/configure.in:1.2.2.2       Fri Jun  6 05:42:46 2003
--- emacs/gc/configure.in       Mon Jun 16 11:36:45 2003
***************
*** 17,28 ****
  # Initialization
  # ==============
  
! AC_INIT(gc,6.2alpha4,address@hidden) 
      ## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
  AC_CONFIG_SRCDIR(gcj_mlc.c)
  AC_CANONICAL_TARGET 
  AC_PREREQ(2.53)
- AC_REVISION($Revision: 1.2.2.2 $)
  GC_SET_VERSION
  AM_INIT_AUTOMAKE
  
--- 17,27 ----
  # Initialization
  # ==============
  
! AC_INIT(gc,[6.2alpha6, modified for Emacs]) 
      ## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
  AC_CONFIG_SRCDIR(gcj_mlc.c)
  AC_CANONICAL_TARGET 
  AC_PREREQ(2.53)
  GC_SET_VERSION
  AM_INIT_AUTOMAKE
  
***************
*** 64,70 ****
  )
  
  AC_ARG_ENABLE(cplusplus,
! [  --enable-cplusplus         include C++ support in GC library and include 
directory],
  )
  
  AC_ARG_ENABLE(cppflags,
--- 63,69 ----
  )
  
  AC_ARG_ENABLE(cplusplus,
! [  --enable-cplusplus         install C++ support],
  )
  
  AC_ARG_ENABLE(cppflags,
***************
*** 99,104 ****
--- 98,107 ----
        AC_DEFINE(GC_LINUX_THREADS)
        AC_DEFINE(_REENTRANT)
        ;;
+      *-*-aix*)
+       AC_DEFINE(GC_AIX_THREADS)
+       AC_DEFINE(_REENTRANT)
+       ;;
       *-*-hpux*)
        AC_MSG_WARN("Only HP/UX 11 threads are supported.")
        AC_DEFINE(GC_HPUX_THREADS)
***************
*** 126,132 ****
        AC_DEFINE(GC_WIN32_THREADS)
        ;;
       *-*-darwin*)
!       AC_DEFINE(GC_MACOSX_THREADS)
        ;;
       *-*-osf*)
        AC_DEFINE(GC_OSF1_THREADS)
--- 129,139 ----
        AC_DEFINE(GC_WIN32_THREADS)
        ;;
       *-*-darwin*)
!       AC_DEFINE(GC_DARWIN_THREADS)
!       AC_DEFINE(THREAD_LOCAL_ALLOC)
!       if test "${enable_parallel_mark}" = yes; then
!         AC_DEFINE(PARALLEL_MARK)
!       fi
        ;;
       *-*-osf*)
        AC_DEFINE(GC_OSF1_THREADS)
***************
*** 169,175 ****
  esac
  AC_SUBST(THREADLIBS)
  
! # I'm not too familiar with autoconf, is this the best way to do this? -Brian
  case "$host" in
    *-*-darwin*) ;;
    *) 
--- 176,190 ----
  esac
  AC_SUBST(THREADLIBS)
  
! case "$host" in 
!    powerpc-*-darwin*)
!       powerpc_darwin=true
!       ;;
! esac
! AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
! 
! # We never want libdl on darwin. It is a fake libdl that just ends up making
! # dyld calls anyway
  case "$host" in
    *-*-darwin*) ;;
    *) 
***************
*** 193,198 ****
--- 208,214 ----
  )
  
  addobjs=
+ addlibs=
  addincludes=
  addtests=
  CXXINCLUDES=
***************
*** 207,217 ****
  esac
  
  if test "${enable_cplusplus}" = yes; then
-       addobjs="$addobjs gc_cpp.lo"
        addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
        addtests="$addtests test_cpp"
  fi
  
  AC_SUBST(CXX)
  
  AC_SUBST(INCLUDES)
--- 223,234 ----
  esac
  
  if test "${enable_cplusplus}" = yes; then
        addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
        addtests="$addtests test_cpp"
  fi
  
+ AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
+ 
  AC_SUBST(CXX)
  
  AC_SUBST(INCLUDES)
***************
*** 286,291 ****
--- 303,309 ----
  addobjs="$addobjs $machdep"
  AC_SUBST(addobjs)
  AC_SUBST(addincludes)
+ AC_SUBST(addlibs)
  AC_SUBST(addtests)
  
  AM_PROG_LIBTOOL