Remove common submodule

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "m4"]
 	path = m4
 	url = ../icecast-m4.git
-[submodule "src/common"]
-	path = src/common
-	url = ../icecast-common.git

autogen.sh

@@ -5,13 +5,10 @@ set -e
 srcdir=$(dirname "$0")
 test -n "$srcdir" && cd "$srcdir"
 
-if ! {
 # Test for any file in the m4 submodule
-  test -e "$srcdir/m4/ax_check_compile_flag.m4" &&
-# Test for any file in the common submodule
-  test -e "$srcdir/src/common/log/log.c"; };
+if ! test -e "$srcdir/m4/ax_check_compile_flag.m4"
 then
-    echo "ERROR: Submodules missing! Ensure you git cloned with '--recursive' or run:"
+    echo "ERROR: Submodule missing! Ensure you git cloned with '--recursive' or run:"
     echo "         git submodule update --init"
     exit 1
 fi

configure.ac

@@ -8,6 +8,8 @@ AC_CONFIG_AUX_DIR([build-aux])
 
 AC_PROG_CC
 
+LT_INIT
+
 AX_CHECK_COMPILE_FLAG([-std=c99], [
   AX_APPEND_FLAG([-std=c99])
 ], [
@@ -44,9 +46,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AM_MAINTAINER_MODE([enable])
 
-LT_INIT
-
-
 dnl Sanitizer flags
 
 AC_ARG_WITH([sanitizer],
@@ -100,8 +99,6 @@ AC_CHECK_HEADERS([sys/timeb.h])
 AC_CHECK_HEADERS([sys/socket.h])
 AC_CHECK_HEADERS([pwd.h grp.h])
 
-XIPH_NET
-
 dnl Check for functions
 AC_FUNC_FORK
 AC_FUNC_CHOWN
@@ -109,24 +106,17 @@ AC_FUNC_CHOWN
 AC_CHECK_FUNCS([setuid])
 AC_CHECK_FUNCS([chroot])
 AC_CHECK_FUNCS([strcasestr])
-AC_CHECK_FUNCS([gethostname])
 AC_CHECK_FUNCS([uname])
 AC_CHECK_FUNCS([setenv])
 AC_CHECK_FUNCS([setresuid])
 AC_CHECK_FUNCS([setresgid])
 AC_CHECK_FUNCS([localtime_r])
-AC_CHECK_FUNCS([gettimeofday])
-AC_CHECK_FUNCS([ftime])
 
 dnl Do not check for poll on Darwin, it is broken in some versions
 AS_IF([test "${SYS}" != "darwin"], [
   AC_CHECK_FUNCS([poll])
 ])
 
-AC_SEARCH_LIBS([nanosleep], [rt posix4], [
-  AC_DEFINE([HAVE_NANOSLEEP], [1], [Define if you have nanosleep])
-])
-
 dnl Checks for types and typedefs
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
@@ -136,6 +126,16 @@ AC_TYPE_UID_T
 
 dnl Checks for required libraries
 
+dnl
+dnl permafrost
+dnl
+PKG_CHECK_MODULES([PERMAFROST], [permafrost], [], [
+  AC_MSG_ERROR([${PERMAFROST_PKG_ERRORS}. permafrost is required.])
+])
+
+CFLAGS="${CFLAGS} ${PERMAFROST_CFLAGS}"
+LIBS="${LIBS} ${PERMAFROST_LIBS}"
+
 dnl
 dnl libxml2
 dnl
@@ -274,24 +274,12 @@ AS_IF([test "$with_default_config" != "no"], [
   
 ])
 
-dnl Make substitutions
-AC_SUBST(XIPH_LIBS)
-AC_SUBST(XIPH_CPPFLAGS)
-AC_SUBST(XIPH_CFLAGS)
-AC_SUBST(XIPH_LDFLAGS)
-
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([
   Makefile
   conf/Makefile
   src/Makefile
-  src/common/avl/Makefile
-  src/common/httpp/Makefile
-  src/common/thread/Makefile
-  src/common/log/Makefile
-  src/common/net/Makefile
-  src/common/timing/Makefile
   doc/Makefile
   web/Makefile
   admin/Makefile

src/Makefile.am

@@ -1,7 +1,5 @@
 ## Process this with automake to create Makefile.in
 
-SUBDIRS = common/avl common/net common/thread common/httpp common/log common/timing
-
 bin_PROGRAMS = icecast
 
 noinst_HEADERS = \
@@ -132,15 +130,4 @@ EXTRA_icecast_SOURCES = \
     format_theora.c \
     format_speex.c
 
-icecast_DEPENDENCIES = \
-    common/net/libicenet.la \
-    common/thread/libicethread.la \
-    common/httpp/libicehttpp.la \
-    common/log/libicelog.la \
-    common/avl/libiceavl.la \
-    common/timing/libicetiming.la
-
-icecast_LDADD    = $(icecast_DEPENDENCIES)
-icecast_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/common
-
 include $(srcdir)/tests/Makefile.am

src/acl.h

@@ -16,7 +16,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include "common/httpp/httpp.h"
+#include <permafrost/httpp.h>
 
 #include "icecasttypes.h"
 #include "cfgfile.h"

src/auth.c

@@ -24,13 +24,14 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include <permafrost/httpp.h>
+
 #include "auth.h"
 #include "source.h"
 #include "client.h"
 #include "errors.h"
 #include "cfgfile.h"
 #include "stats.h"
-#include "common/httpp/httpp.h"
 #include "fserve.h"
 #include "admin.h"
 #include "acl.h"

src/auth.h

@@ -22,8 +22,8 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include "common/thread/thread.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/httpp.h>
 
 #include "icecasttypes.h"
 #include "cfgfile.h"

src/auth_htpasswd.c

@@ -26,11 +26,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <permafrost/httpp.h>
+
 #include "auth.h"
 #include "source.h"
 #include "client.h"
 #include "cfgfile.h"
-#include "common/httpp/httpp.h"
 #include "md5.h"
 
 #include "logging.h"

src/auth_url.c

@@ -74,7 +74,8 @@
 #include "client.h"
 #include "cfgfile.h"
 #include "connection.h"
-#include "common/httpp/httpp.h"
+
+#include <permafrost/httpp.h>
 
 #include "logging.h"
 #define CATMODULE "auth_url"

src/cfgfile.c

@@ -26,7 +26,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 
 #include "cfgfile.h"
 #include "global.h"

src/cfgfile.h

@@ -23,8 +23,9 @@
 #define MAX_YP_DIRECTORIES 25
 
 #include <libxml/tree.h>
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+
 #include "icecasttypes.h"
 #include "compat.h"
 

src/client.c

@@ -26,9 +26,9 @@
 
 #include <libxml/tree.h>
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/httpp.h>
 
 #include "global.h"
 #include "refobject.h"

src/client.h

@@ -19,8 +19,8 @@
 #ifndef __CLIENT_H__
 #define __CLIENT_H__
 
-#include "common/httpp/httpp.h"
-#include "common/httpp/encoding.h"
+#include <permafrost/httpp.h>
+#include <permafrost/encoding.h>
 
 #include "icecasttypes.h"
 #include "errors.h"

src/common

@@ -1 +0,0 @@
-Subproject commit ad5fc1006122f42abd34ade3f42bf2779297140d

src/connection.c

@@ -33,10 +33,10 @@
 #include <winsock2.h>
 #endif
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/net/sock.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/sock.h>
+#include <permafrost/httpp.h>
 
 #include "compat.h"
 #include "connection.h"

src/connection.h

@@ -21,8 +21,9 @@
 
 #include "icecasttypes.h"
 #include "compat.h"
-#include "common/thread/thread.h"
-#include "common/net/sock.h"
+
+#include <permafrost/thread.h>
+#include <permafrost/sock.h>
 
 typedef unsigned long connection_id_t;
 

src/event.h

@@ -13,7 +13,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 
 #include "icecasttypes.h"
 

src/fastevent.c

@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 
 #include "fastevent.h"
 

src/format.h

@@ -25,7 +25,8 @@
 #include "client.h"
 #include "refbuf.h"
 #include "cfgfile.h"
-#include "common/httpp/httpp.h"
+
+#include <permafrost/httpp.h>
 
 typedef enum _format_type_tag
 {

src/format_mp3.c

@@ -36,7 +36,8 @@
 
 #include "stats.h"
 #include "format.h"
-#include "common/httpp/httpp.h"
+
+#include <permafrost/httpp.h>
 
 #include "logging.h"
 

src/fserve.c

@@ -42,10 +42,10 @@
 #endif
 #endif
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
-#include "common/net/sock.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/httpp.h>
+#include <permafrost/sock.h>
 
 #include "fserve.h"
 #include "compat.h"

src/global.c

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
 
 #include "global.h"
 #include "refobject.h"

src/global.h

@@ -21,8 +21,8 @@
 
 #define ICECAST_VERSION_STRING "Icecast " PACKAGE_VERSION
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
 #include "icecasttypes.h"
 
 typedef struct ice_global_tag

src/listensocket.c

@@ -22,8 +22,8 @@
 
 #include <string.h>
 
-#include "common/net/sock.h"
-#include "common/thread/thread.h"
+#include <permafrost/sock.h>
+#include <permafrost/thread.h>
 
 #include "listensocket.h"
 #include "global.h"

src/logging.c

@@ -19,8 +19,8 @@
 #include <time.h>
 #include <string.h>
 
-#include "common/thread/thread.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/httpp.h>
 
 #include "logging.h"
 #include "connection.h"

src/logging.h

@@ -14,7 +14,7 @@
 #ifndef __LOGGING_H__
 #define __LOGGING_H__
 
-#include "common/log/log.h"
+#include <permafrost/log.h>
 
 #include "icecasttypes.h"
 

src/main.c

@@ -44,10 +44,10 @@
 #include <sys/utsname.h>
 #endif
 
-#include "common/thread/thread.h"
-#include "common/net/sock.h"
-#include "common/net/resolver.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/sock.h>
+#include <permafrost/resolver.h>
+#include <permafrost/httpp.h>
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>

src/matchfile.c

@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "common/avl/avl.h"
+#include <permafrost/avl.h>
 
 #include "matchfile.h"
 #include "logging.h"

src/module.c

@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
 
 #include "refobject.h"
 #include "module.h"

src/refobject.c

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 
 #include "refobject.h"
 

src/refobject.h

@@ -17,9 +17,10 @@
 #include <config.h>
 #endif
 
+
 #include <stdarg.h>
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 
 #include "icecasttypes.h"
 #include "compat.h"

src/reportxml.c

@@ -16,8 +16,8 @@
 
 #include <string.h>
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
 
 #include "reportxml.h"
 #include "refobject.h"

src/sighandler.c

@@ -17,9 +17,9 @@
 
 #include <signal.h>
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/httpp.h>
 
 #include "global.h"
 #include "connection.h"

src/slave.c

@@ -38,10 +38,11 @@
 #include "compat.h"
 
 #include <libxml/uri.h>
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/net/sock.h"
-#include "common/httpp/httpp.h"
+
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/sock.h>
+#include <permafrost/httpp.h>
 
 #include "slave.h"
 #include "cfgfile.h"

src/slave.h

@@ -14,7 +14,7 @@
 #ifndef __SLAVE_H__
 #define __SLAVE_H__
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 #include "icecasttypes.h"
 #include "cfgfile.h"
 

src/source.c

@@ -39,9 +39,9 @@
 #define snprintf _snprintf
 #endif
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/httpp.h>
 
 #include "source.h"
 #include "compat.h"

src/source.h

@@ -16,8 +16,8 @@
 
 #include <stdio.h>
 
-#include "common/thread/thread.h"
-#include "common/httpp/httpp.h"
+#include <permafrost/thread.h>
+#include <permafrost/httpp.h>
 
 #include "icecasttypes.h"
 #include "yp.h"

src/stats.c

@@ -25,10 +25,10 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
-#include "common/net/sock.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/httpp.h>
+#include <permafrost/sock.h>
 
 #include "stats.h"
 #include "connection.h"

src/tests/Makefile.am

@@ -30,15 +30,11 @@ check_PROGRAMS += ctest_resourcematch.test
 
 ctest_refobject_test_SOURCES = %reldir%/ctest_refobject.c
 ctest_refobject_test_LDADD = libice_ctest.la \
-    common/thread/libicethread.la \
-    common/avl/libiceavl.la \
     icecast-refobject.o
 check_PROGRAMS += ctest_refobject.test
 
 ctest_buffer_test_SOURCES = %reldir%/ctest_buffer.c
 ctest_buffer_test_LDADD = libice_ctest.la \
-    common/thread/libicethread.la \
-    common/avl/libiceavl.la \
     icecast-refobject.o \
     icecast-buffer.o
 check_PROGRAMS += ctest_buffer.test

src/tls.h

@@ -9,7 +9,7 @@
 #ifndef __TLS_H__
 #define __TLS_H__
 
-#include "common/net/sock.h"
+#include <permafrost/sock.h>
 
 /* Do we have TLS Support? */
 #if defined(HAVE_OPENSSL)

src/util.c

@@ -39,8 +39,8 @@
 #include <windows.h>
 #endif
 
-#include "common/net/sock.h"
-#include "common/thread/thread.h"
+#include <permafrost/sock.h>
+#include <permafrost/thread.h>
 
 #include "util.h"
 #include "compat.h"

src/util.h

@@ -17,7 +17,7 @@
 /* for FILE* */
 #include <stdio.h>
 
-#include "common/net/sock.h"
+#include <permafrost/sock.h>
 #include "icecasttypes.h"
 
 #define UNKNOWN_CONTENT 0

src/xslt.c

@@ -41,10 +41,10 @@
 #define snprintf _snprintf
 #endif
 
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
-#include "common/net/sock.h"
+#include <permafrost/thread.h>
+#include <permafrost/avl.h>
+#include <permafrost/httpp.h>
+#include <permafrost/sock.h>
 
 #include "xslt.h"
 #include "refbuf.h"

src/yp.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "common/thread/thread.h"
+#include <permafrost/thread.h>
 
 #include "yp.h"
 #include "global.h"