From 23617b08bd57c141f3e1390d8624b4ec31904a9c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 25 May 2010 06:57:24 -0600 Subject: [PATCH] change default Unix-style installation to use racket in path Merge to v5.0 --- src/configure | 11 ++++++----- src/racket/configure.ac | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/configure b/src/configure index 5552b23f4a..38af3cf86f 100755 --- a/src/configure +++ b/src/configure @@ -576,7 +576,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_unique_file="PLT Scheme" +ac_unique_file="Racket" ac_unique_file="racket/src/bignum.c" # Factoring default headers for most tests. ac_includes_default="\ @@ -2201,10 +2201,10 @@ else # Set prefix explicitly so we can use it during configure prefix="${ac_default_prefix}" fi - libpltdir="${libdir}/plt" - collectsdir="${libdir}/plt/collects" - includepltdir="${includedir}/plt" - docdir="${datadir}/plt/doc" + libpltdir="${libdir}/racket" + collectsdir="${libdir}/racket/collects" + includepltdir="${includedir}/racket" + docdir="${datadir}/racket/doc" MAKE_COPYTREE=copytree COLLECTS_PATH='${collectsdir}' INSTALL_ORIG_TREE=no @@ -5855,6 +5855,7 @@ case $OS in FreeBSD) LIBS="$LIBS -rdynamic" DYN_CFLAGS="-fPIC" + GC_THREADS_FLAG="-DGC_FREEBSD_THREADS" enable_pthread=yes ;; OpenBSD) diff --git a/src/racket/configure.ac b/src/racket/configure.ac index 5384a13e82..229e8501a9 100644 --- a/src/racket/configure.ac +++ b/src/racket/configure.ac @@ -20,7 +20,7 @@ # it needs to include C++ flags that we don't want for Racket. # hence PREFLAGS, which is initialized to the original CPPFLAGS. -AC_INIT([PLT Scheme]) +AC_INIT([Racket]) AC_CONFIG_SRCDIR(racket/src/bignum.c) AC_CONFIG_HEADERS([racket/mzconfig.h]) @@ -234,10 +234,10 @@ else # Set prefix explicitly so we can use it during configure prefix="${ac_default_prefix}" fi - libpltdir="${libdir}/plt" - collectsdir="${libdir}/plt/collects" - includepltdir="${includedir}/plt" - docdir="${datadir}/plt/doc" + libpltdir="${libdir}/racket" + collectsdir="${libdir}/racket/collects" + includepltdir="${includedir}/racket" + docdir="${datadir}/racket/doc" MAKE_COPYTREE=copytree COLLECTS_PATH='${collectsdir}' INSTALL_ORIG_TREE=no