mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
89 lines
2.8 KiB
Diff
89 lines
2.8 KiB
Diff
|
From 9af8ee5baceab59d46154c96da62b52935f363fe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nick Hainke <vincent@systemli.org>
|
||
|
|
Date: Mon, 27 Jun 2022 20:43:11 +0200
|
||
|
|
Subject: [PATCH] configure.ac: fix AC_ARG_WITH
|
||
|
|
|
||
|
|
In the new version the configuration no longer respects the
|
||
|
|
--without/--with blkid/selinux parameters. Add the tests for
|
||
|
|
"with_blkid" and "with_selinux" back to configure.ac as described
|
||
|
|
in the manual.
|
||
|
|
|
||
|
|
Link: https://www.gnu.org/software/autoconf/manual/autoconf-2.60/html_node/External-Software.html
|
||
|
|
|
||
|
|
Fixes: c48335416a09 ("configure.ac: Enable cross-compilation")
|
||
|
|
|
||
|
|
Signed-off-by: Nick Hainke <vincent@systemli.org>
|
||
|
|
---
|
||
|
|
configure.ac | 44 ++++++++++++++++++++++++++++++--------------
|
||
|
|
1 file changed, 30 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -39,12 +39,16 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign
|
||
|
|
|
||
|
|
# Test configure options.
|
||
|
|
AC_ARG_WITH([selinux],
|
||
|
|
- AS_HELP_STRING([--without-selinux],
|
||
|
|
- [Ignore presence of libselinux and disable selinux support]))
|
||
|
|
+ [AS_HELP_STRING([--without-selinux],
|
||
|
|
+ [Ignore presence of libselinux and disable selinux support])],
|
||
|
|
+ [],
|
||
|
|
+ [with_selinux=check])
|
||
|
|
|
||
|
|
AC_ARG_WITH([blkid],
|
||
|
|
- AS_HELP_STRING([--without-blkid],
|
||
|
|
- [Ignore presence of libblkid and disable blkid support]))
|
||
|
|
+ [AS_HELP_STRING([--without-blkid],
|
||
|
|
+ [Ignore presence of libblkid and disable blkid support])],
|
||
|
|
+ [],
|
||
|
|
+ [with_blkid=check])
|
||
|
|
|
||
|
|
# Checks for programs.
|
||
|
|
AC_PROG_CC
|
||
|
|
@@ -55,11 +59,17 @@ AC_PATH_PROG([LDCONFIG], [ldconfig],
|
||
|
|
[$PATH:/sbin])
|
||
|
|
|
||
|
|
# Checks for libraries.
|
||
|
|
-AC_CHECK_LIB([blkid], [blkid_probe_all],
|
||
|
|
- [AC_SUBST([libblkid_LIBS], ["-lblkid"])
|
||
|
|
- AC_DEFINE([HAVE_LIBBLKID], [1],
|
||
|
|
- [Define if you have libblkid])
|
||
|
|
- ], [], [])
|
||
|
|
+AS_IF([test "x$with_blkid" != xno],
|
||
|
|
+ [AC_CHECK_LIB([blkid], [blkid_probe_all],
|
||
|
|
+ [AC_SUBST([libblkid_LIBS], ["-lblkid"])
|
||
|
|
+ AC_DEFINE([HAVE_LIBBLKID], [1],
|
||
|
|
+ [Define if you have libblkid])
|
||
|
|
+ ],
|
||
|
|
+ [if test "x$with_blkid" != xcheck; then
|
||
|
|
+ AC_MSG_FAILURE(
|
||
|
|
+ [--with-blkid was given, but test for blkid failed])
|
||
|
|
+ fi
|
||
|
|
+ ], -lblkid)])
|
||
|
|
|
||
|
|
AC_CHECK_LIB([lzo2], [main],
|
||
|
|
[AC_SUBST([liblzo2_LIBS], ["-llzo2"])
|
||
|
|
@@ -73,11 +83,17 @@ AC_CHECK_LIB([lz4], [main],
|
||
|
|
[Define if you have liblz4])
|
||
|
|
], [], [])
|
||
|
|
|
||
|
|
-AC_CHECK_LIB([selinux], [getcon],
|
||
|
|
- [AC_SUBST([libselinux_LIBS], ["-lselinux"])
|
||
|
|
- AC_DEFINE([HAVE_LIBSELINUX], [1],
|
||
|
|
- [Define if you have libselinux])
|
||
|
|
- ], [], [])
|
||
|
|
+AS_IF([test "x$with_selinux" != xno],
|
||
|
|
+ [AC_CHECK_LIB([selinux], [getcon],
|
||
|
|
+ [AC_SUBST([libselinux_LIBS], ["-lselinux"])
|
||
|
|
+ AC_DEFINE([HAVE_LIBSELINUX], [1],
|
||
|
|
+ [Define if you have libselinux])
|
||
|
|
+ ],
|
||
|
|
+ [if test "x$with_selinux" != xcheck; then
|
||
|
|
+ AC_MSG_FAILURE(
|
||
|
|
+ [--with-selinux was given, but test for selinux failed])
|
||
|
|
+ fi
|
||
|
|
+ ], -lselinux)])
|
||
|
|
|
||
|
|
AC_CHECK_LIB([uuid], [uuid_clear],
|
||
|
|
[AC_SUBST([libuuid_LIBS], ["-luuid"])
|