2 files changed, 8 insertions, 6 deletions

diff --git a/configure b/configure
index 51767d296..1b827922d 100755
--- a/configure
+++ b/configure
@@ -3334,7 +3334,7 @@ else
 $as_echo "yes" >&6; }
 
                 EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS"
-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"
+                LIBS="$LIBS $AA_LIBS"
 
 fi
 
@@ -3350,7 +3350,7 @@ fi
 if test "x$enable_selinux" = "xyes"; then :
 
         HAVE_SELINUX="-DHAVE_SELINUX"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux"
+        LIBS="$LIBS -lselinux"
 
 fi
 
@@ -3612,7 +3612,8 @@ fi
 if test "x$enable_gcov" = "xyes"; then :
 
         HAVE_GCOV="--coverage -DHAVE_GCOV"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS --coverage"
+        LIBS="$LIBS -lgcov"
 
 fi
 
diff --git a/configure.ac b/configure.ac
index 416d79682..556019232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [
         HAVE_APPARMOR="-DHAVE_APPARMOR"
         PKG_CHECK_MODULES([AA], [libapparmor], [
                 EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS"
-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"
+                LIBS="$LIBS $AA_LIBS"
         ])
 ])
 
@@ -82,7 +82,7 @@ AC_ARG_ENABLE([selinux],
     [AS_HELP_STRING([--enable-selinux], [SELinux labeling support])])
 AS_IF([test "x$enable_selinux" = "xyes"], [
         HAVE_SELINUX="-DHAVE_SELINUX"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux"
+        LIBS="$LIBS -lselinux"
 ])
 
 AC_SUBST([EXTRA_CFLAGS])
@@ -226,7 +226,8 @@ AC_ARG_ENABLE([gcov],
     [AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])])
 AS_IF([test "x$enable_gcov" = "xyes"], [
         HAVE_GCOV="--coverage -DHAVE_GCOV"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS --coverage"
+        LIBS="$LIBS -lgcov"
 ])
 
 HAVE_CONTRIB_INSTALL="yes"