From 7c713d7dd0c4368cb4195fa513cc33bc2ed9da55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Sat, 26 Sep 2015 11:20:04 +0200
Subject: [PATCH] build: fix tabs and don't overwrite gc dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
---
 src/aclocal.m4 |  8 +++-----
 src/configure  | 10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index cde4167a1..8f4d104fb 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -455,7 +455,6 @@ case "${host}" in
 		THREAD_LIBS='-lpthread'
 		SHARED_LDFLAGS="-shared ${LDFLAGS}"
 		BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-		ECL_GC_DIR=gc-unstable
 		ECL_LDRPATH='-Wl,--rpath,~A'
 		CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
 		SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
@@ -468,7 +467,6 @@ case "${host}" in
 		THREAD_LIBS='-lpthread'
 		dnl SHARED_LDFLAGS="-shared ${LDFLAGS}"
 		dnl BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-		ECL_GC_DIR=gc-unstable
 		dnl ECL_LDRPATH='-Wl,--rpath,~A'
 		CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
 		dnl SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
@@ -1039,10 +1037,10 @@ if test "${enable_boehm}" = "included"; then
  if mkdir gc; then
    if (destdir=`${PWDCMD}`; cd gc; \
        $srcdir/${ECL_GC_DIR}/configure --disable-shared --prefix=${destdir} \
-	 --includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
-	 --host=${host_alias} --enable-large-config \
+         --includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
+         --host=${host_alias} --enable-large-config \
          CC="${CC} ${PICFLAG}" CFLAGS="$CFLAGS" \
-	 LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
+         LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
          ${boehm_configure_flags}); then
      ECL_BOEHM_GC_HEADER='ecl/gc/gc.h'
      SUBDIRS="${SUBDIRS} gc"
diff --git a/src/configure b/src/configure
index 13dc9c638..fc5f555a1 100755
--- a/src/configure
+++ b/src/configure
@@ -5076,7 +5076,6 @@ case "${host}" in
 		THREAD_LIBS='-lpthread'
 		SHARED_LDFLAGS="-shared ${LDFLAGS}"
 		BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-		ECL_GC_DIR=gc-unstable
 		ECL_LDRPATH='-Wl,--rpath,~A'
 		CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
 		SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
@@ -5089,8 +5088,7 @@ LSP_FEATURES="(cons :nacl ${LSP_FEATURES})"
 		thehost='linux'
 		THREAD_CFLAGS='-D_THREAD_SAFE'
 		THREAD_LIBS='-lpthread'
-						ECL_GC_DIR=gc-unstable
-				CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
+								CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
 
 LSP_FEATURES="(cons :nacl ${LSP_FEATURES})"
 
@@ -6139,10 +6137,10 @@ $as_echo "$as_me: Configuring included Boehm GC library:" >&6;}
  if mkdir gc; then
    if (destdir=`${PWDCMD}`; cd gc; \
        $srcdir/${ECL_GC_DIR}/configure --disable-shared --prefix=${destdir} \
-	 --includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
-	 --host=${host_alias} --enable-large-config \
+         --includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
+         --host=${host_alias} --enable-large-config \
          CC="${CC} ${PICFLAG}" CFLAGS="$CFLAGS" \
-	 LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
+         LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
          ${boehm_configure_flags}); then
      ECL_BOEHM_GC_HEADER='ecl/gc/gc.h'
      SUBDIRS="${SUBDIRS} gc"