From beee9b4a26419a6a40194c24a8c2abc2cfdd371e Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 16 Feb 2020 14:14:04 -0500
Subject: [PATCH] lib: Fix so that `--enable-pcreposix` actually compiles

The `--enable-pcreposix` configure option was not actually compiling
properly.  Follow pre-existing pattern for inclusion of regex.h
or the pcreposix.h header.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 lib/frrstr.c | 4 ++++
 lib/frrstr.h | 5 +++++
 lib/vty.c    | 5 +++++
 lib/vty.h    | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/lib/frrstr.c b/lib/frrstr.c
index 8a72a35af0..7ef5fffd12 100644
--- a/lib/frrstr.c
+++ b/lib/frrstr.c
@@ -25,7 +25,11 @@
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
+#ifdef HAVE_LIBPCREPOSIX
+#include <pcreposix.h>
+#else
 #include <regex.h>
+#endif /* HAVE_LIBPCREPOSIX */
 
 #include "frrstr.h"
 #include "memory.h"
diff --git a/lib/frrstr.h b/lib/frrstr.h
index 3a935c90cb..441d7b8670 100644
--- a/lib/frrstr.h
+++ b/lib/frrstr.h
@@ -22,7 +22,12 @@
 #define _FRRSTR_H_
 
 #include <sys/types.h>
+#include <sys/types.h>
+#ifdef HAVE_LIBPCREPOSIX
+#include <pcreposix.h>
+#else
 #include <regex.h>
+#endif /* HAVE_LIBPCREPOSIX */
 #include <stdbool.h>
 
 #include "vector.h"
diff --git a/lib/vty.c b/lib/vty.c
index 893c215b43..4dd6ec1b35 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -23,7 +23,12 @@
 
 #include <lib/version.h>
 #include <sys/types.h>
+#include <sys/types.h>
+#ifdef HAVE_LIBPCREPOSIX
+#include <pcreposix.h>
+#else
 #include <regex.h>
+#endif /* HAVE_LIBPCREPOSIX */
 #include <stdio.h>
 
 #include "linklist.h"
diff --git a/lib/vty.h b/lib/vty.h
index a0b8e8afa1..f90a35a260 100644
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -22,7 +22,11 @@
 #define _ZEBRA_VTY_H
 
 #include <sys/types.h>
+#ifdef HAVE_LIBPCREPOSIX
+#include <pcreposix.h>
+#else
 #include <regex.h>
+#endif /* HAVE_LIBPCREPOSIX */
 
 #include "thread.h"
 #include "log.h"
-- 
2.39.5