ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed help string for --with-swig

Browse Source
This commit is contained in:
Scott Fennell 2018-07-12 16:05:39 -05:00
parent 2a13bf34af
commit 63ab0ffc22
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autoconf/configure.ac
View File

@ -123,13 +123,13 @@ AC_DEFUN([AX_GTEST_HOME],[
AC_SUBST([GTEST_HOME])
])
AC_DEFUN([AX_SWIG_HOME],[
AC_DEFUN([AX_SWIG_BIN],[
AC_ARG_WITH([swig],
AS_HELP_STRING([--with-swig@<:@=DIR@:>@], [SWIG root directory]),
SWIG_HOME="$withval",
SWIG_HOME=/bin:/usr/bin:/usr/local/bin:/sw/bin
AS_HELP_STRING([--with-swig@<:@=DIR@:>@], [path of directory containing the SWIG executable.]),
SWIG_BIN="$withval",
SWIG_BIN=/bin:/usr/bin:/usr/local/bin:/sw/bin
)
AC_SUBST([SWIG_HOME])
AC_SUBST([SWIG_BIN])
])
AC_DEFUN([AX_UDUNITS_HOME],[
@ -255,8 +255,12 @@ AC_PATH_PROG(PYTHON, python${PYTHON_VERSION}, nopython)
AS_IF([test "$ac_cv_path_PYTHON" = "nopython"],AC_MSG_ERROR([could not find python]),[])
AC_PATH_PROG(GNUPLOT, gnuplot, nognuplot)
AS_IF([test "$ac_cv_path_GNUPLOT" = "nognuplot"],AC_MSG_NOTICE([could not find gnuplot]),[])
AX_SWIG_HOME([])
AC_PATH_PROG(SWIG, swig, noswig, $SWIG_HOME)
AX_SWIG_BIN([])
echo $SWIG_BIN
echo
echo
AC_PATH_PROG(SWIG, swig, noswig, $SWIG_BIN)
echo $SWIG
AS_IF([test "$ac_cv_path_SWIG" = "noswig"],AC_MSG_ERROR([could not find swig]),[])
AX_JAVA
dnl look for libraries and headers we need to compile

13
configure vendored
View File

@ -661,7 +661,7 @@ JAVA_CC_FLAGS
JAVA_CC
USE_JAVA
SWIG
SWIG_HOME
SWIG_BIN
GNUPLOT
PYTHON
PERL
@ -1387,7 +1387,7 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-swig[=DIR] SWIG root directory
--with-swig[=DIR] path of directory containing the SWIG executable.
--with-x use the X Window System
--with-llvm[=DIR] LLVM root directory
--with-zlib=DIR root directory path of zlib installation [defaults to
@ -4136,14 +4136,17 @@ fi
# Check whether --with-swig was given.
if test "${with_swig+set}" = set; then :
withval=$with_swig; SWIG_HOME="$withval"
withval=$with_swig; SWIG_BIN="$withval"
else
SWIG_HOME=/bin:/usr/bin:/usr/local/bin:/sw/bin
SWIG_BIN=/bin:/usr/bin:/usr/local/bin:/sw/bin
fi
echo $SWIG_BIN
echo
echo
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@ -4157,7 +4160,7 @@ else
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $SWIG_HOME
for as_dir in $SWIG_BIN
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.