X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/c076146f56b235db3757c6b075e4d3f0f000e0be..c7e016d34b8f0429c0cd9e5366625fdf83776297:/lib/configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index c2f0791..83423c7 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -36,9 +36,7 @@
 #if HAVE_LANGINFO_H
 # include <langinfo.h>
 #endif
-#if HAVE_PCRE_H
-# include <pcre.h>
-#endif
+#include <pcre.h>
 #if HAVE_SHLOBJ_H
 # include <Shlobj.h>
 #endif
@@ -55,9 +53,7 @@
 #include "charset.h"
 #include "defs.h"
 #include "printf.h"
-#if HAVE_PCRE_H
-# include "regsub.h"
-#endif
+#include "regsub.h"
 #include "signame.h"
 #include "authhash.h"
 #include "vector.h"
@@ -401,7 +397,6 @@ static int set_sample_format(const struct config_state *cs,
 			     nvec, vec);
 }
 
-#if HAVE_PCRE_H
 static int set_namepart(const struct config_state *cs,
 			const struct conf *whoami,
 			int nvec, char **vec) {
@@ -487,7 +482,6 @@ static int set_transform(const struct config_state *cs,
   ++tl->n;
   return 0;
 }
-#endif
 
 static int set_rights(const struct config_state *cs,
 		      const struct conf *whoami,
@@ -569,7 +563,6 @@ static void free_collectionlist(struct config *c,
   xfree(cll->s);
 }
 
-#if HAVE_PCRE_H
 static void free_namepartlist(struct config *c,
 			      const struct conf *whoami) {
   struct namepartlist *npl = ADDRESS(c, struct namepartlist);
@@ -602,7 +595,6 @@ static void free_transformlist(struct config *c,
   }
   xfree(tl->t);
 }
-#endif
 
 static void free_netaddress(struct config *c,
 			    const struct conf *whoami) {
@@ -622,10 +614,8 @@ static const struct conftype
   type_stringlist_accum = { set_stringlist_accum, free_stringlistlist },
   type_string_accum = { set_string_accum, free_stringlist },
   type_sample_format = { set_sample_format, free_none },
-#if HAVE_PCRE_H
   type_namepart = { set_namepart, free_namepartlist },
   type_transform = { set_transform, free_transformlist },
-#endif
   type_netaddress = { set_netaddress, free_netaddress },
   type_rights = { set_rights, free_string };
 
@@ -1056,9 +1046,7 @@ static const struct conf conf[] = {
   { C(mount_rescan),     &type_boolean,          validate_any },
   { C(multicast_loop),   &type_boolean,          validate_any },
   { C(multicast_ttl),    &type_integer,          validate_non_negative },
-#if HAVE_PCRE_H
   { C(namepart),         &type_namepart,         validate_any },
-#endif
   { C(new_bias),         &type_integer,          validate_positive },
   { C(new_bias_age),     &type_integer,          validate_positive },
   { C(new_max),          &type_integer,          validate_positive },
@@ -1098,9 +1086,7 @@ static const struct conf conf[] = {
   { C(stopword),         &type_string_accum,     validate_any },
   { C(templates),        &type_string_accum,     validate_isdir },
   { C(tracklength),      &type_stringlist_accum, validate_tracklength },
-#if HAVE_PCRE_H
   { C(transform),        &type_transform,        validate_any },
-#endif
   { C(url),              &type_string,           validate_url },
 #if !_WIN32
   { C(user),             &type_string,           validate_isauser },
@@ -1449,12 +1435,9 @@ void config_free(struct config *c) {
 static void config_postdefaults(struct config *c,
 				int server) {
   struct config_state cs;
-#if HAVE_PCRE_H
   const struct conf *whoami;
   int n;
-#endif
 
-#if HAVE_PCRE_H
   static const char *namepart[][4] = {
     { "title",  "/([0-9]+ *[-:]? *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" },
     { "title",  "/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort" },
@@ -1472,12 +1455,10 @@ static void config_postdefaults(struct config *c,
     { "dir",   "[[:punct:]]",                           "", "sort", "g", }
   };
 #define NTRANSFORM (int)(sizeof transform / sizeof *transform)
-#endif
 
   cs.path = "<internal>";
   cs.line = 0;
   cs.config = c;
-#if HAVE_PCRE_H
   if(!c->namepart.n) {
     whoami = find("namepart");
     for(n = 0; n < NNAMEPART; ++n)
@@ -1488,7 +1469,6 @@ static void config_postdefaults(struct config *c,
     for(n = 0; n < NTRANSFORM; ++n)
       set_transform(&cs, whoami, 5, (char **)transform[n]);
   }
-#endif
   if(!c->api) {
     if(c->speaker_command)
       c->api = xstrdup("command");
@@ -1604,12 +1584,10 @@ int config_read(int server,
       disorder_error(0, "'nice_server' cannot be changed without a restart");
       /* ...but we accept the new config anyway */
     }
-#if HAVE_PCRE_H
     if(namepartlist_compare(&c->namepart, &oldconfig->namepart)) {
       disorder_error(0, "'namepart' settings cannot be changed without a restart");
       failed = 1;
     }
-#endif
     if(stringlist_compare(&c->stopword, &oldconfig->stopword)) {
       disorder_error(0, "'stopword' settings cannot be changed without a restart");
       failed = 1;
@@ -1702,7 +1680,6 @@ static int stringlist_compare(const struct stringlist *a,
     return 0;
 }
 
-#if HAVE_PCRE_H
 /** @brief Order two namepart definitions
  * @param a First namepart definition
  * @param b Second namepart definition
@@ -1748,7 +1725,6 @@ static int namepartlist_compare(const struct namepartlist *a,
   else
     return 0;
 }
-#endif
 
 /** @brief Verify configuration table.
  * @return The number of problems found