[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet-gtk] branch master updated: Fix search path for lib64 #6538
From: |
gnunet |
Subject: |
[gnunet-gtk] branch master updated: Fix search path for lib64 #6538 |
Date: |
Sat, 14 Nov 2020 02:27:45 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 22309202 Fix search path for lib64 #6538
22309202 is described below
commit 22309202ff242e4c447764fffed538029aaa7bf9
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Nov 14 10:20:17 2020 +0900
Fix search path for lib64 #6538
---
configure.ac | 13 +++++++++++--
m4/ltsugar.m4 | 2 +-
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
#
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet-gtk] branch master updated: Fix search path for lib64 #6538,
gnunet <=