ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix options in configure script

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

refs #13
This commit is contained in:
Alex Lin 2015-06-10 17:49:09 -05:00
parent 7f48653697
commit eb1f4f7e71
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -705,6 +705,8 @@ with_hdf5
with_dmtcp with_dmtcp
with_tpro with_tpro
with_bc635 with_bc635
with_gsl
with_gtest
' '
ac_precious_vars='build_alias ac_precious_vars='build_alias
host_alias host_alias
@ -1332,8 +1334,8 @@ Optional Packages:
--with-dmtcp[=DIR] DMTCP root directory --with-dmtcp[=DIR] DMTCP root directory
--with-tpro[=DIR] TPRO root directory --with-tpro[=DIR] TPRO root directory
--with-bc635[=DIR] BC635 root directory --with-bc635[=DIR] BC635 root directory
--with-bc635[=DIR] GSL root directory --with-gsl[=DIR] GSL root directory
--with-bc635[=DIR] GTEST root directory --with-gtest[=DIR] GTEST root directory
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@ -3784,7 +3786,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 3787 "configure" */ /* #line 3789 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -4030,9 +4032,9 @@ fi
# Check whether --with-bc635 was given. # Check whether --with-gsl was given.
if test "${with_bc635+set}" = set; then : if test "${with_gsl+set}" = set; then :
withval=$with_bc635; GSL_HOME="$withval" withval=$with_gsl; GSL_HOME="$withval"
as_ac_File=`$as_echo "ac_cv_file_$GSL_HOME/include/gsl" | $as_tr_sh` 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 "$as_me:${as_lineno-$LINENO}: checking for $GSL_HOME/include/gsl" >&5
$as_echo_n "checking for $GSL_HOME/include/gsl... " >&6; } $as_echo_n "checking for $GSL_HOME/include/gsl... " >&6; }
@ -4067,9 +4069,9 @@ fi
# Check whether --with-bc635 was given. # Check whether --with-gtest was given.
if test "${with_bc635+set}" = set; then : if test "${with_gtest+set}" = set; then :
withval=$with_bc635; GTEST_HOME="$withval" withval=$with_gtest; GTEST_HOME="$withval"
as_ac_File=`$as_echo "ac_cv_file_$GTEST_HOME/include/gtest" | $as_tr_sh` 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 "$as_me:${as_lineno-$LINENO}: checking for $GTEST_HOME/include/gtest" >&5
$as_echo_n "checking for $GTEST_HOME/include/gtest... " >&6; } $as_echo_n "checking for $GTEST_HOME/include/gtest... " >&6; }

8
configure.ac
View File

@ -70,8 +70,8 @@ AC_DEFUN([AX_BC635_HOME],[
]) ])
AC_DEFUN([AX_GSL_HOME],[ AC_DEFUN([AX_GSL_HOME],[
AC_ARG_WITH([bc635], AC_ARG_WITH([gsl],
AS_HELP_STRING([--with-bc635@<:@=DIR@:>@], [GSL root directory]), AS_HELP_STRING([--with-gsl@<:@=DIR@:>@], [GSL root directory]),
[GSL_HOME="$withval" [GSL_HOME="$withval"
AC_CHECK_FILE([$GSL_HOME/include/gsl], AC_CHECK_FILE([$GSL_HOME/include/gsl],
[], [],
@ -84,8 +84,8 @@ AC_DEFUN([AX_GSL_HOME],[
]) ])
AC_DEFUN([AX_GTEST_HOME],[ AC_DEFUN([AX_GTEST_HOME],[
AC_ARG_WITH([bc635], AC_ARG_WITH([gtest],
AS_HELP_STRING([--with-bc635@<:@=DIR@:>@], [GTEST root directory]), AS_HELP_STRING([--with-gtest@<:@=DIR@:>@], [GTEST root directory]),
[GTEST_HOME="$withval" [GTEST_HOME="$withval"
AC_CHECK_FILE([$GTEST_HOME/include/gtest], AC_CHECK_FILE([$GTEST_HOME/include/gtest],
[], [],