Skip to content

Commit

Permalink
Fixing obvious bug
Browse files Browse the repository at this point in the history
  • Loading branch information
abkarcher committed Jul 24, 2020
1 parent 54162c6 commit 7c77c2f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -11137,7 +11137,7 @@ else
with_libacvpdir=no
fi

if test "x$libacvpdir" ; then
if test "x$libacvpdir" != "x" ; then
LDFLAGS="$LDFLAGS -L$libacvpdir/lib"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acvp_create_test_session" >&5
$as_echo_n "checking for library containing acvp_create_test_session... " >&6; }
Expand Down Expand Up @@ -11207,7 +11207,7 @@ fi
fi

# If given a libacvp_dir, use that when building things dependent on library, otherwise, use defaults
if test "x$libacvpdir" ; then
if test "x$libacvpdir" != "x" ; then
LIBACVP_LDFLAGS="-L$libacvpdir/lib"

LIBACVP_CFLAGS="-I$libacvpdir/include"
Expand Down Expand Up @@ -11295,7 +11295,7 @@ else
fi


if test "x$with_libcurldir" != xno && test "x$with_libcurldir" != ""; then
if test "x$libcurldir" != "x"; then
LIBCURL_CFLAGS="-I$libcurldir/include"

LIBCURL_LDFLAGS="-L$libcurldir/lib -lcurl"
Expand Down Expand Up @@ -11377,7 +11377,7 @@ else
fi


if test "x$with_libmurldir" != xno && test "x$with_libmurldir" != "" ; then
if test "x$libmurldir" != "x"; then
CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL"
LDFLAGS="$LDFLAGS -L$libmurldir -lmurl"
#only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if test "x$disable_lib" = "xyes" ; then
[Path to libacvp install directory, for use when building the app only])],
[libacvpdir="$withval"],
[with_libacvpdir=no])
if test "x$libacvpdir" ; then
if test "x$libacvpdir" != "x" ; then
LDFLAGS="$LDFLAGS -L$libacvpdir/lib"
AC_SEARCH_LIBS([acvp_create_test_session], [acvp], [],
[AC_MSG_FAILURE([can't find libacvp library])], [-ldl])
Expand All @@ -143,7 +143,7 @@ if test "x$disable_lib" = "xyes" ; then
fi

# If given a libacvp_dir, use that when building things dependent on library, otherwise, use defaults
if test "x$libacvpdir" ; then
if test "x$libacvpdir" != "x" ; then
AC_SUBST([LIBACVP_LDFLAGS], ["-L$libacvpdir/lib"])
AC_SUBST([LIBACVP_CFLAGS], ["-I$libacvpdir/include"])
else
Expand Down Expand Up @@ -204,7 +204,7 @@ if test "x$enable_offline" = "xfalse" && test "x$disable_lib" = "xno" ; then
[libcurldir="$withval"],
[with_libcurldir=no])

if test "x$with_libcurldir" != xno && test "x$with_libcurldir" != ""; then
if test "x$libcurldir" != "x"; then
AC_SUBST([LIBCURL_CFLAGS], "-I$libcurldir/include")
AC_SUBST([LIBCURL_LDFLAGS], "-L$libcurldir/lib -lcurl")
LDFLAGS="$LDFLAGS -L$libcurldir/lib"
Expand All @@ -222,7 +222,7 @@ if test "x$enable_offline" = "xfalse" && test "x$disable_lib" = "xno" ; then
[libmurldir="$withval"],
[with_libmurldir=no])

if test "x$with_libmurldir" != xno && test "x$with_libmurldir" != "" ; then
if test "x$libmurldir" != "x"; then
CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL"
LDFLAGS="$LDFLAGS -L$libmurldir -lmurl"
#only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies
Expand Down

0 comments on commit 7c77c2f

Please sign in to comment.