Make libupnp.m4 work with lib64 directories too

amule-project · Oct 3, 2018 · 9ee7158 · 9ee7158
1 parent f6dccde
commit 9ee7158
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/m4/libupnp.m4 b/m4/libupnp.m4
@@ -45,11 +45,16 @@ m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl
 
 dnl	Test for --with-libupnp-prefix
 	AC_ARG_WITH(
-		[libupnp-prefix],
-		[AS_HELP_STRING(
+		[libupnp-prefix],[
+		AS_HELP_STRING(
 			[--with-libupnp-prefix=PREFIX],
-			[UPnP library location])],
-		[export PKG_CONFIG_PATH=$withval/lib/pkgconfig])
+			[UPnP library location])],[
+		AS_IF([test -d "$withval/lib64/pkgconfig"],[
+			export PKG_CONFIG_PATH=$withval/lib64/pkgconfig
+		],[
+			export PKG_CONFIG_PATH=$withval/lib/pkgconfig
+		])
+	])
 
 dnl	Check for libupnp >= MIN_LIBUPNP_VERSION
 	AS_IF([test $cross_compiling = no], [