ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Fix builds without --with-libgcrypt-prefix nor --with-libgcrypt-libdir.

Browse source 
Reported by Manolis Ragkousis <manolis837@gmail.com>.
Fixes a regression introduced in 14af289.

Before this commit, ./configure would leave LIBGCRYPT_PREFIX and
LIBGCRYPT_LIBDIR undefined, leading to LIBGCRYPT_LIBS="-L -lgcrypt" and
thus to a link failure.

* configure.ac: Make sure $LIBGCRYPT_PREFIX and $LIBGCRYPT_LIBDIR are
  never empty.
This commit is contained in:
Ludovic Courtès 2014-05-22 10:38:41 +02:00
parent 641f9a2a1f
commit a3977466db
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -124,7 +124,9 @@ AC_ARG_WITH([libgcrypt-prefix],
LIBGCRYPT_LIBDIR="$withval/lib" LIBGCRYPT_LIBDIR="$withval/lib"
;; ;;
esac], esac],
[LIBGCRYPT="libgcrypt"]) [LIBGCRYPT="libgcrypt"
LIBGCRYPT_PREFIX="no"
LIBGCRYPT_LIBDIR="no"])
AC_ARG_WITH([libgcrypt-libdir], AC_ARG_WITH([libgcrypt-libdir],
[AS_HELP_STRING([--with-libgcrypt-libdir=DIR], [AS_HELP_STRING([--with-libgcrypt-libdir=DIR],
@ -141,6 +143,9 @@ AC_ARG_WITH([libgcrypt-libdir],
esac], esac],
[if test "x$LIBGCRYPT" = x; then [if test "x$LIBGCRYPT" = x; then
LIBGCRYPT="libgcrypt" LIBGCRYPT="libgcrypt"
fi
if test "x$LIBGCRYPT_LIBDIR" = x; then
LIBGCRYPT_LIBDIR="no"
fi]) fi])
dnl Library name suitable for `dynamic-link'. dnl Library name suitable for `dynamic-link'.