hardlink: use PRCE2 posix header file

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 0bc6a11666fab2eef224d0e190b2f3eeacf8e2ee..72f25d307b6e4b78adb394f5a0cf34799b86c4a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1412,11 +1412,13 @@ UL_REQUIRES_HAVE([setpriv], [linux_capability_h], [linux/capability.h header fil
 UL_REQUIRES_HAVE([setpriv], [cap_ng], [libcap-ng library])
 AM_CONDITIONAL([BUILD_SETPRIV], [test "x$build_setpriv" = xyes])
 
-PKG_CHECK_MODULES([PCRE], [libpcre2-8], [have_pcre=yes], [have_pcre=no])
-AS_IF([test "x$have_pcre" = xyes ], [
-    AC_DEFINE([HAVE_PCRE], [1], [Define if libpcre2 is available])
+PKG_CHECK_MODULES([PCRE2_POSIX], [libpcre2-posix],
+                 [have_pcre2_posix=yes],
+                 [have_pcre2_posix=no])
+AS_IF([test "x$have_pcre2_posix" = xyes ], [
+    AC_DEFINE([HAVE_PCRE2_POSIX], [1], [Define if libpcre2-posix is available])
 ])
-AM_CONDITIONAL([HAVE_PCRE], [test "x$have_pcre" = xyes])
+AM_CONDITIONAL([HAVE_PCRE2_POSIX], [test "x$have_pcre2_posix" = xyes])
 
 AC_ARG_ENABLE([hardlink],
   AS_HELP_STRING([--disable-hardlink], [do not build hardlink]),
@@ -1425,6 +1427,7 @@ AC_ARG_ENABLE([hardlink],
 UL_BUILD_INIT([hardlink])
 AM_CONDITIONAL([BUILD_HARDLINK], [test "x$build_hardlink" = xyes])
 
+
 AC_ARG_ENABLE([eject],
   AS_HELP_STRING([--disable-eject], [do not build eject]),
   [], [UL_DEFAULT_ENABLE([eject], [check])]

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 59dea5875836c92a01f04b87e961aadcb1717fb1..2c0405884e926d18e34b7396156c098dbae25eb2 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -225,9 +225,9 @@ usrbin_exec_PROGRAMS += hardlink
 hardlink_SOURCES = misc-utils/hardlink.c
 hardlink_LDADD = $(LDADD) libcommon.la
 hardlink_CFLAGS = $(AM_CFLAGS)
-if HAVE_PCRE
-hardlink_LDADD += $(PCRE_LIBS)
-hardlink_CFLAGS += $(PCRE_CFLAGS)
+if HAVE_PCRE2_POSIX
+hardlink_LDADD += $(PCRE2_POSIX_LIBS)
+hardlink_CFLAGS += $(PCRE2_POSIX_CFLAGS)
 endif
 dist_man_MANS += misc-utils/hardlink.1
 endif

diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c
index 580c4ba4c1ba72ee65b6ab24e12bc5958fd3cfcc..d888f7cb7b2203722d75c70ce11ea8fa543a2997 100644 (file)
--- a/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@ -42,19 +42,13 @@
 #include "nls.h"
 #include "c.h"
 
-
-/* Use libpcreposix if it's available, it's cooler */
-#if defined(HAVE_libpcre2_posix)
-#warning hie
-#include <pcre2posix.h>
-#undef REG_NOSUB
-#define REG_NOSUB 0             /* we do want backreferences in PCRE mode */
-#elif defined(HAVE_libpcreposix)
-#include <pcreposix.h>
-#undef REG_NOSUB
-#define REG_NOSUB 0             /* we do want backreferences in PCRE mode */
+/* Use libpcre2posix if it's available */
+#ifdef HAVE_PCRE2_POSIX
+# include <pcre2posix.h>
+# undef REG_NOSUB
+# define REG_NOSUB 0             /* we do want backreferences in PCRE mode */
 #else
-#include <regex.h>              /* regcomp(), regsearch() */
+# include <regex.h>              /* regcomp(), regsearch() */
 #endif
 
 #ifdef HAVE_XATTR