From eb1f4f7e71a099193c0102d48e0932f62b08af70 Mon Sep 17 00:00:00 2001
From: Alex Lin <alexander.s.lin@nasa.gov>
Date: Wed, 10 Jun 2015 17:49:09 -0500
Subject: [PATCH] Fix options in configure script

Fixed copy and paste errors for the optional gsl and gtest packages for the configure script.

refs #13
---
 configure    | 20 +++++++++++---------
 configure.ac |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 600ac015..8f126d6b 100755
--- a/configure
+++ b/configure
@@ -705,6 +705,8 @@ with_hdf5
 with_dmtcp
 with_tpro
 with_bc635
+with_gsl
+with_gtest
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1332,8 +1334,8 @@ Optional Packages:
   --with-dmtcp[=DIR]      DMTCP root directory
   --with-tpro[=DIR]       TPRO root directory
   --with-bc635[=DIR]      BC635 root directory
-  --with-bc635[=DIR]      GSL root directory
-  --with-bc635[=DIR]      GTEST root directory
+  --with-gsl[=DIR]        GSL root directory
+  --with-gtest[=DIR]      GTEST root directory
 
 Some influential environment variables:
   CC          C compiler command
@@ -3784,7 +3786,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 3787 "configure" */
+/* #line 3789 "configure" */
 public class Test {
 }
 EOF
@@ -4030,9 +4032,9 @@ fi
 
 
 
-# Check whether --with-bc635 was given.
-if test "${with_bc635+set}" = set; then :
-  withval=$with_bc635; GSL_HOME="$withval"
+# Check whether --with-gsl was given.
+if test "${with_gsl+set}" = set; then :
+  withval=$with_gsl; GSL_HOME="$withval"
                  as_ac_File=`$as_echo "ac_cv_file_$GSL_HOME/include/gsl" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GSL_HOME/include/gsl" >&5
 $as_echo_n "checking for $GSL_HOME/include/gsl... " >&6; }
@@ -4067,9 +4069,9 @@ fi
 
 
 
-# Check whether --with-bc635 was given.
-if test "${with_bc635+set}" = set; then :
-  withval=$with_bc635; GTEST_HOME="$withval"
+# Check whether --with-gtest was given.
+if test "${with_gtest+set}" = set; then :
+  withval=$with_gtest; GTEST_HOME="$withval"
                  as_ac_File=`$as_echo "ac_cv_file_$GTEST_HOME/include/gtest" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTEST_HOME/include/gtest" >&5
 $as_echo_n "checking for $GTEST_HOME/include/gtest... " >&6; }
diff --git a/configure.ac b/configure.ac
index 5845c549..04c8e0ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,8 +70,8 @@ AC_DEFUN([AX_BC635_HOME],[
 ])
 
 AC_DEFUN([AX_GSL_HOME],[
-    AC_ARG_WITH([bc635],
-                AS_HELP_STRING([--with-bc635@<:@=DIR@:>@], [GSL root directory]),
+    AC_ARG_WITH([gsl],
+                AS_HELP_STRING([--with-gsl@<:@=DIR@:>@], [GSL root directory]),
                 [GSL_HOME="$withval"
                  AC_CHECK_FILE([$GSL_HOME/include/gsl],
                                [],
@@ -84,8 +84,8 @@ AC_DEFUN([AX_GSL_HOME],[
 ])
 
 AC_DEFUN([AX_GTEST_HOME],[
-    AC_ARG_WITH([bc635],
-                AS_HELP_STRING([--with-bc635@<:@=DIR@:>@], [GTEST root directory]),
+    AC_ARG_WITH([gtest],
+                AS_HELP_STRING([--with-gtest@<:@=DIR@:>@], [GTEST root directory]),
                 [GTEST_HOME="$withval"
                  AC_CHECK_FILE([$GTEST_HOME/include/gtest],
                                [],