refer to cfgfile.h instead of config.h for icecast.xml, and use config.h

for autoconf

svn path=/trunk/icecast/; revision=5156

src/admin.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6,7 +10,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include "config.h"
+#include "cfgfile.h"
 #include "connection.h"
 #include "refbuf.h"
 #include "client.h"

src/client.c

@@ -4,6 +4,10 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 

src/configtest.c

@@ -1,5 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include "config.h"
+#include "cfgfile.h"
 
 void _dump_config(ice_config_t *config);
 

src/connection.c

@@ -1,4 +1,8 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,7 +31,7 @@
 #include "net/sock.h"
 #include "httpp/httpp.h"
 
-#include "config.h"
+#include "cfgfile.h"
 #include "global.h"
 #include "util.h"
 #include "connection.h"

src/event.c

@@ -1,5 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "event.h"
-#include "config.h"
+#include "cfgfile.h"
 
 #include "refbuf.h"
 #include "client.h"

src/format.c

@@ -5,6 +5,10 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

src/format_mp3.c

@@ -5,6 +5,10 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/format_vorbis.c

@@ -4,6 +4,10 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/fserve.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,7 +32,7 @@
 #include "stats.h"
 #include "format.h"
 #include "logging.h"
-#include "config.h"
+#include "cfgfile.h"
 #include "util.h"
 
 #include "fserve.h"

src/geturl.c

@@ -1,4 +1,8 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -12,7 +16,7 @@
 #include "format.h"
 #include "geturl.h"
 #include "source.h"
-#include "config.h"
+#include "cfgfile.h"
 
 #include <curl/curl.h>
 #include <curl/types.h>

src/global.c

@@ -1,4 +1,8 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 
 #include "thread/thread.h"

src/logging.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
@@ -10,7 +14,7 @@
 #include "client.h"
 
 #include "os.h"
-#include "config.h"
+#include "cfgfile.h"
 #include "logging.h"
 
 #ifdef _WIN32

src/main.c

@@ -1,4 +1,8 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
@@ -15,7 +19,7 @@
 #include <errno.h>
 #endif
 
-#include "config.h"
+#include "cfgfile.h"
 #include "sighandler.h"
 
 #include "global.h"

src/refbuf.c

@@ -4,6 +4,10 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 

src/sighandler.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <signal.h>
 
 #include "thread/thread.h"
@@ -46,8 +50,6 @@ void _sig_hup(int signo)
 
     connection_inject_event(EVENT_CONFIG_READ, NULL);
     
-    /* reopen logfiles (TODO: We don't do this currently) */
-
     /* some OSes require us to reattach the signal handler */
     signal(SIGHUP, _sig_hup);
 }

src/slave.c

@@ -6,6 +6,10 @@
  * and creates source threads for any it doesn't already have.
  * */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,7 +34,7 @@
 #include "net/sock.h"
 #include "httpp/httpp.h"
 
-#include "config.h"
+#include "cfgfile.h"
 #include "global.h"
 #include "util.h"
 #include "connection.h"

src/source.c

@@ -1,4 +1,8 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,7 +30,7 @@
 #include "client.h"
 #include "stats.h"
 #include "logging.h"
-#include "config.h"
+#include "cfgfile.h"
 #include "util.h"
 #ifdef USE_YP
 #include "geturl.h"

src/source.h

@@ -1,7 +1,7 @@
 #ifndef __SOURCE_H__
 #define __SOURCE_H__
 
-#include "config.h"
+#include "cfgfile.h"
 #include "yp.h"
 #include "util.h"
 #include "format.h"

src/stats.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/util.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
@@ -21,7 +25,7 @@
 
 #include "net/sock.h"
 
-#include "config.h"
+#include "cfgfile.h"
 #include "util.h"
 #include "os.h"
 #include "refbuf.h"

src/xslt.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/debugXML.h>

src/yp.c

@@ -1,4 +1,8 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -12,7 +16,7 @@
 #include "format.h"
 #include "geturl.h"
 #include "source.h"
-#include "config.h"
+#include "cfgfile.h"
 
 #define CATMODULE "yp"