[PATCH] build: Use `libgcrypt-config' to set the default value for LIBGCRYPT.

[PATCH] build: Use `libgcrypt-config' to set the default value for LIBGCRYPT.

[宋文武]

* configure.ac: Set LIBGCRYP_PREFIX, LIBGCRYPT_LIBDIR and LIBGCRYPT according
  to the output of `libgcrypt-config'.
---
 configure.ac | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1cfe876..afffea1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,43 +132,42 @@ else
    AC_MSG_RESULT([not found])
 fi
 
+AC_MSG_CHECKING([for libgcrypt-config])
+AC_PATH_PROG([LIBGCRYPT_CONFIG], [libgcrypt-config])
+if test "x$LIBGCRYPT_CONFIG" != "x"; then
+   LIBGCRYPT_PREFIX=`$LIBGCRYPT_CONFIG --prefix`
+   LIBGCRYPT_LIBDIR=`$LIBGCRYPT_CONFIG --libs | sed -e "s/.*-L\([[^ ]]\+\)[[[:blank:]]]\+-lgcrypt.*/\1/g"`
+   LIBGCRYPT="$LIBGCRYPT_LIBDIR/libgcrypt"
+else
+   LIBGCRYPT_PREFIX="no"
+   LIBGCRYPT_LIBDIR="no"
+   LIBGCRYPT="libgcrypt"
+fi
+
 AC_ARG_WITH([libgcrypt-prefix],
   [AS_HELP_STRING([--with-libgcrypt-prefix=DIR], [search for GNU libgcrypt in DIR])],
   [case "$withval" in
     yes|no)
-      LIBGCRYPT="libgcrypt"
-      LIBGCRYPT_PREFIX="no"
-      LIBGCRYPT_LIBDIR="no"
       ;;
     *)
       LIBGCRYPT="$withval/lib/libgcrypt"
       LIBGCRYPT_PREFIX="$withval"
       LIBGCRYPT_LIBDIR="$withval/lib"
       ;;
-   esac],
-  [LIBGCRYPT="libgcrypt"
-   LIBGCRYPT_PREFIX="no"
-   LIBGCRYPT_LIBDIR="no"])
+   esac]])
 
 AC_ARG_WITH([libgcrypt-libdir],
   [AS_HELP_STRING([--with-libgcrypt-libdir=DIR],
      [search for GNU libgcrypt's shared library in DIR])],
   [case "$withval" in
     yes|no)
-      LIBGCRYPT="libgcrypt"
-      LIBGCRYPT_LIBDIR="no"
       ;;
     *)
       LIBGCRYPT="$withval/libgcrypt"
       LIBGCRYPT_LIBDIR="$withval"
       ;;
-   esac],
-  [if test "x$LIBGCRYPT" = x; then
-      LIBGCRYPT="libgcrypt"
-   fi
-   if test "x$LIBGCRYPT_LIBDIR" = x; then
-      LIBGCRYPT_LIBDIR="no"
-   fi])
+   esac]])
+
 
 dnl Library name suitable for `dynamic-link'.
 AC_MSG_CHECKING([for libgcrypt shared library name])
-- 
2.5.0

Re: [PATCH] build: Use `libgcrypt-config' to set the default value for LIBGCRYPT.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * configure.ac: Set LIBGCRYP_PREFIX, LIBGCRYPT_LIBDIR and LIBGCRYPT according
>   to the output of `libgcrypt-config'.

I ended up doing it a bit differently in dd01fec.

Thank you!

Ludo’.