config fixes

diff --git a/config/Makefile.am b/config/Makefile.am
deleted file mode 100644 (file)
index 5fdd1a2..0000000
--- a/config/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/flymake.am
-
-AUTOMAKE_OPTIONS = 1.6 foreign
-
-EXTRA_DIST = account.h address.h bool.h inheritance.h magic.h mbtable.h number.h path.h quad.h regex2.h set.h sort.h string3.h types.h
-
-AM_CPPFLAGS = -I$(top_srcdir)
-
-noinst_LIBRARIES = libconfig.a
-
-libconfig_a_SOURCES = account.c address.c bool.c magic.c mbtable.c number.c path.c quad.c regex.c set.c sort.c string.c
-

diff --git a/config/regex.c b/config/regex.c
index 411108374e30b9fef5953732fb36c1daceca1c07..8523f869fff8eedeb730683c609282fccf230420 100644 (file)
--- a/config/regex.c
+++ b/config/regex.c
@@ -194,7 +194,7 @@ static int regex_native_set(const struct ConfigSet *cs, void *var,
 
   if (orig && orig->pattern)
   {
-    r = regex_create(orig->pattern, cdef->flags, err);
+    r = regex_create(orig->pattern, cdef->type, err);
     if (!r)
       rc = CSR_ERR_INVALID;
   }
@@ -260,7 +260,7 @@ static int regex_reset(const struct ConfigSet *cs, void *var,
 
   if (initial)
   {
-    r = regex_create(initial, cdef->flags, err);
+    r = regex_create(initial, cdef->type, err);
     if (!r)
       return CSR_ERR_CODE;
   }

diff --git a/config/regex2.h b/config/regex2.h
index 6b2d4c93463b6f943d1fb61d8071088ebd6180a2..4cc22afa4da5dcd64393912d16664129dc1ec8bd 100644 (file)
--- a/config/regex2.h
+++ b/config/regex2.h
@@ -23,7 +23,6 @@
 #ifndef _CONFIG_REGEX_H
 #define _CONFIG_REGEX_H
 
-#include <features.h>
 #include <regex.h>
 #include <stdbool.h>