Skip to content

Commit

Permalink
fix issue #152
Browse files Browse the repository at this point in the history
  • Loading branch information
adokter committed Jul 29, 2020
1 parent 381e692 commit 60eefd8
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 23 deletions.
43 changes: 21 additions & 22 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for vol2bird 0.4.1.
# Generated by GNU Autoconf 2.69 for vol2bird 0.5.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='vol2bird'
PACKAGE_TARNAME='vol2bird'
PACKAGE_VERSION='0.4.1'
PACKAGE_STRING='vol2bird 0.4.1'
PACKAGE_VERSION='0.5.0'
PACKAGE_STRING='vol2bird 0.5.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -687,7 +687,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -765,7 +764,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
Expand Down Expand Up @@ -1018,15 +1016,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1164,7 +1153,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1277,7 +1266,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures vol2bird 0.4.1 to adapt to many kinds of systems.
\`configure' configures vol2bird 0.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1317,7 +1306,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand All @@ -1339,7 +1327,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of vol2bird 0.4.1:";;
short | recursive ) echo "Configuration of vol2bird 0.5.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1430,7 +1418,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
vol2bird configure 0.4.1
vol2bird configure 0.5.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1728,7 +1716,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by vol2bird $as_me 0.4.1, which was
It was created by vol2bird $as_me 0.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -4816,6 +4804,10 @@ if [ "$HLHDF_SZLIB_LIB" != "" ]; then
LD_PRINTOUT=$LD_PRINTOUT:`echo "$HLHDF_SZLIB_LIB" | sed -e"s/[ \t]*-L//"`
fi
if [ "$TORCH_LIBRARY_FLAG" != "" ]; then
LD_PRINTOUT=$LD_PRINTOUT:`echo "$TORCH_LIBRARY_FLAG" | sed -e"s/[ \t]*-L//"`
fi
Expand Down Expand Up @@ -4857,7 +4849,10 @@ fi
ac_config_files="$ac_config_files def.mk"
ac_config_files="$ac_config_files vol2bird.sh"
if [ "x$TORCH_SUPPRESSED" = "xno" ]; then
ac_config_files="$ac_config_files libmistnet/configure"
fi
Expand Down Expand Up @@ -5403,7 +5398,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by vol2bird $as_me 0.4.1, which was
This file was extended by vol2bird $as_me 0.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5456,7 +5451,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
vol2bird config.status 0.4.1
vol2bird config.status 0.5.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -5567,6 +5562,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"def.mk") CONFIG_FILES="$CONFIG_FILES def.mk" ;;
"vol2bird.sh") CONFIG_FILES="$CONFIG_FILES vol2bird.sh" ;;
"libmistnet/configure") CONFIG_FILES="$CONFIG_FILES libmistnet/configure" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
Expand Down Expand Up @@ -6018,6 +6014,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
chmod 755 ./vol2bird.sh
if [ "x$TORCH_SUPPRESSED" = "xno" ]; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: starting CMake configuration of libmistnet" >&5
$as_echo "$as_me: starting CMake configuration of libmistnet" >&6;}
Expand All @@ -6027,3 +6025,4 @@ $as_echo "$as_me: starting CMake configuration of libmistnet" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
$as_echo "done" >&6; }
fi
11 changes: 10 additions & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during vol2bird
dnl installation to configure the system for the local environment.

AC_INIT([vol2bird],[0.4.1])
AC_INIT([vol2bird],[0.5.0])

if test "${prefix}" = "NONE"; then
prefix=/opt/radar/vol2bird
Expand Down Expand Up @@ -546,6 +546,10 @@ if [[ "$HLHDF_SZLIB_LIB" != "" ]]; then
LD_PRINTOUT=$LD_PRINTOUT:`echo "$HLHDF_SZLIB_LIB" | sed -e"s/[[ \t]]*-L//"`
fi

if [[ "$TORCH_LIBRARY_FLAG" != "" ]]; then
LD_PRINTOUT=$LD_PRINTOUT:`echo "$TORCH_LIBRARY_FLAG" | sed -e"s/[[ \t]]*-L//"`
fi

AC_SUBST(RAVE_ROOT_DIR)
AC_SUBST(RAVE_INCLUDE_FLAG)
AC_SUBST(RAVE_LIB_FLAG)
Expand Down Expand Up @@ -586,15 +590,20 @@ AC_SUBST(MISTNET_CFLAG)

AC_SUBST(LD_PRINTOUT)
AC_CONFIG_FILES(def.mk)
AC_CONFIG_FILES(vol2bird.sh)
if [[ "x$TORCH_SUPPRESSED" = "xno" ]]; then

AC_CONFIG_FILES(libmistnet/configure)
fi
AC_OUTPUT

chmod 755 ./vol2bird.sh

if [[ "x$TORCH_SUPPRESSED" = "xno" ]]; then
AC_MSG_NOTICE(starting CMake configuration of libmistnet)
cd libmistnet
chmod 755 configure
./configure
AC_MSG_RESULT(done)
fi

4 changes: 4 additions & 0 deletions vol2bird.sh.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
export DYLD_LIBRARY_PATH=@LD_PRINTOUT@:../lib
export LD_LIBRARY_PATH=@LD_PRINTOUT@:../lib
./src/vol2bird $@

0 comments on commit 60eefd8

Please sign in to comment.