From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Mon, 16 Jun 2014 20:40:56 +0000 (-0400)
Subject: Minor fixes to get-abc script and configure stuff.
X-Git-Tag: cvc5-1.0.0~6700^2~20
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a86a9bc9198cc5c1bfd538c4e8728f091d114335;p=cvc5.git

Minor fixes to get-abc script and configure stuff.
---

diff --git a/config/abc.m4 b/config/abc.m4
index d86b2f465..0d91a36a5 100644
--- a/config/abc.m4
+++ b/config/abc.m4
@@ -6,6 +6,7 @@ AC_MSG_CHECKING([whether user requested abc support])
 LIBABC=
 have_libabc=0
 ABC_LIBS=
+ABC_LDFLAGS=
 if test "$with_abc" = no; then
   AC_MSG_RESULT([no, abc disabled by user])
 elif test "$with_abc" = yes; then
diff --git a/contrib/get-abc b/contrib/get-abc
index f5a397039..8e04ca655 100755
--- a/contrib/get-abc
+++ b/contrib/get-abc
@@ -27,12 +27,12 @@ function webget {
   fi
 }
 
-if [ -z "${MACHINE_TYPE}" ]; then
-  # get first nibble from config.guess (x86_64, i686, ...)
-  MACHINE_TYPE=`config/config.guess | sed 's,-.*,,'`
+if [ -e abc ]; then
+  echo 'error: file or directory "abc" exists; please move it out of the way.' >&2
+  exit 1
 fi
 
-mkdir -p abc
+mkdir abc
 cd abc
 webget https://bitbucket.org/alanmi/abc/get/$commit.tar.gz abc-$commit.tar.gz
 gunzip -f abc-$commit.tar.gz