aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2020-11-14 10:20:17 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2020-11-14 10:20:17 +0900
commit22309202ff242e4c447764fffed538029aaa7bf9 (patch)
tree04cd32d4976b9f0b30fa730534bc7e02eb7c9f68
parent41a604725b56660818cf052e031d685bdfe8fa73 (diff)
downloadgnunet-gtk-22309202ff242e4c447764fffed538029aaa7bf9.tar.gz
gnunet-gtk-22309202ff242e4c447764fffed538029aaa7bf9.zip
Fix search path for lib64 #6538
-rw-r--r--configure.ac13
-rw-r--r--m4/ltsugar.m42
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,
382 [ --with-gnunet=PFX Base of GNUnet installation], 382 [ --with-gnunet=PFX Base of GNUnet installation],
383 [AC_MSG_RESULT([$with_gnunet]) 383 [AC_MSG_RESULT([$with_gnunet])
384 AS_CASE([$with_gnunet], 384 AS_CASE([$with_gnunet],
385 [no],[lookin=""]. 385 [no],[lookin=""],
386 [yes],[lookin="${prefix}"], 386 [yes],[lookin="${prefix}"],
387 [lookin="$with_gnunet"]) 387 [lookin="$with_gnunet"])
388 ], 388 ],
@@ -394,6 +394,9 @@ AC_ARG_WITH(gnunet,
394 [ 394 [
395 gnunet_conversation=1 395 gnunet_conversation=1
396 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH" 396 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
397 if test -d "${lookin}/lib64"; then
398 EXT_LIB_PATH="-L${lookin}/lib64 $EXT_LIB_PATH"
399 fi
397 ] 400 ]
398 ),,[#include <gnunet/platform.h>] 401 ),,[#include <gnunet/platform.h>]
399 ) 402 )
@@ -407,6 +410,9 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
407 backup_CFLAGS="$CFLAGS" 410 backup_CFLAGS="$CFLAGS"
408 backup_CPPFLAGS="$CPPFLAGS" 411 backup_CPPFLAGS="$CPPFLAGS"
409 GNUNET_LIBS="-L${lookin}/lib" 412 GNUNET_LIBS="-L${lookin}/lib"
413 if test -d "${lookin}/lib64"; then
414 GNUNET_LIBS="-L${lookin}/lib64 $GNUNET_LIBS"
415 fi
410 GNUNET_CFLAGS="-I${lookin}/include" 416 GNUNET_CFLAGS="-I${lookin}/include"
411 GNUNET_CPPFLAGS="-I${lookin}/include" 417 GNUNET_CPPFLAGS="-I${lookin}/include"
412 LIBS="$GNUNET_LIBS $backup_LIBS" 418 LIBS="$GNUNET_LIBS $backup_LIBS"
@@ -417,6 +423,10 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
417 [ 423 [
418 gnunet=1 424 gnunet=1
419 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH" 425 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
426 if test -d "${lookin}/lib64"; then
427 EXT_LIB_PATH="-L${lookin}/lib64 $EXT_LIB_PATH"
428 fi
429
420 ] 430 ]
421 ),,[#include <gnunet/platform.h>] 431 ),,[#include <gnunet/platform.h>]
422 ) 432 )
@@ -424,7 +434,6 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
424 AC_CHECK_LIB([gnunetspeaker], [GNUNET_SPEAKER_destroy], 434 AC_CHECK_LIB([gnunetspeaker], [GNUNET_SPEAKER_destroy],
425 [ 435 [
426 gnunet_conversation=1 436 gnunet_conversation=1
427 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
428 ] 437 ]
429 ),,[#include <gnunet/platform.h>] 438 ),,[#include <gnunet/platform.h>]
430 ) 439 )
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 @@
1# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- 1# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
2# 2#
3# Copyright (C) 2004-2005, 2007-2008, 2011-2019 Free Software 3# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
4# Foundation, Inc. 4# Foundation, Inc.
5# Written by Gary V. Vaughan, 2004 5# Written by Gary V. Vaughan, 2004
6# 6#