Fix search path for lib64 #6538

2 files changed, 12 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index d6028a95..c7f04722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,7 +382,7 @@ AC_ARG_WITH(gnunet,
    [  --with-gnunet=PFX       Base of GNUnet installation],
    [AC_MSG_RESULT([$with_gnunet])
     AS_CASE([$with_gnunet],
-      [no],[lookin=""].
+      [no],[lookin=""],
       [yes],[lookin="${prefix}"],
       [lookin="$with_gnunet"])
    ],
@@ -394,6 +394,9 @@ AC_ARG_WITH(gnunet,
       [
         gnunet_conversation=1
         EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
+        if test -d "${lookin}/lib64"; then
+          EXT_LIB_PATH="-L${lookin}/lib64 $EXT_LIB_PATH"
+        fi
       ]
       ),,[#include <gnunet/platform.h>]
      )
@@ -407,6 +410,9 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
   backup_CFLAGS="$CFLAGS"
   backup_CPPFLAGS="$CPPFLAGS"
   GNUNET_LIBS="-L${lookin}/lib"
+  if test -d "${lookin}/lib64"; then
+    GNUNET_LIBS="-L${lookin}/lib64 $GNUNET_LIBS"
+  fi
   GNUNET_CFLAGS="-I${lookin}/include"
   GNUNET_CPPFLAGS="-I${lookin}/include"
   LIBS="$GNUNET_LIBS $backup_LIBS"
@@ -417,6 +423,10 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
       [
         gnunet=1
         EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
+        if test -d "${lookin}/lib64"; then
+          EXT_LIB_PATH="-L${lookin}/lib64 $EXT_LIB_PATH"
+        fi
+
       ]
     ),,[#include <gnunet/platform.h>]
   )
@@ -424,7 +434,6 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
     AC_CHECK_LIB([gnunetspeaker], [GNUNET_SPEAKER_destroy],
       [
         gnunet_conversation=1
-        EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
       ]
     ),,[#include <gnunet/platform.h>]
   )
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index e652d5a1..48bc9344 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2019 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #