Permalink
Browse files

Merge commit 'refs/pull/183/head' of github.com:znc/znc

  • Loading branch information...
2 parents 0a04966 + 524ec57 commit 3d280b1c58803365bd2c52172fee61455cd1f5a1 @DarthGandalf DarthGandalf committed Sep 4, 2012
Showing with 24 additions and 12 deletions.
  1. +4 −0 Makefile.in
  2. +10 −1 configure.ac
  3. +4 −4 test/ConfigTest.cpp
  4. +2 −2 test/EscapeTest.cpp
  5. +2 −2 test/Makefile.in
  6. +2 −3 znc.service
View
@@ -14,6 +14,7 @@ libdir := @libdir@
includedir := @includedir@
sbindir := @sbindir@
localstatedir := @localstatedir@
+systemdsystemunitdir := @systemdsystemunitdir@
CXX := @CXX@
CXXFLAGS := -I$(srcdir)/include -Iinclude @CPPFLAGS@ @CXXFLAGS@
LDFLAGS := @LDFLAGS@
@@ -139,6 +140,9 @@ install: znc $(LIBZNC)
@echo " If you need help with using ZNC, please visit our wiki at:"
@echo " http://znc.in"
+ @HAVE_SYSTEMD_TRUE@test -d $(DESTDIR)$(systemdsystemunitdir) || $(INSTALL) -d $(DESTDIR)$(systemdsystemunitdir)
+ @HAVE_SYSTEMD_TRUE@$(INSTALL_DATA) znc.service $(DESTDIR)$(systemdsystemunitdir)
+
uninstall:
rm $(DESTDIR)$(bindir)/znc
rm $(DESTDIR)$(bindir)/znc-buildmod
View
@@ -90,6 +90,8 @@ case "${host_os}" in
;;
esac
+PKG_PROG_PKG_CONFIG()
+
AC_ARG_WITH( [openssl],
AS_HELP_STRING([--with-openssl=DIR], [openssl installation prefix]),
[OPENSSL=$withval],)
@@ -150,6 +152,14 @@ AC_ARG_ENABLE([add-networks],
AS_HELP_STRING([--enable-add-networks], [allow non-admins to add networks]),
[ if test x"$enableval" = "xyes" ; then appendCXX "-DENABLE_ADD_NETWORK" ; fi ])
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
+
if test "$DEBUG" != "no"; then
appendCXX -ggdb3
AC_DEFINE([_DEBUG], [1], [Define for debugging])
@@ -197,7 +207,6 @@ fi
AC_CHECK_LIB( gnugetopt, getopt_long,)
AC_CHECK_FUNCS([lstat getopt_long getphassphrase])
-PKG_PROG_PKG_CONFIG()
# ----- Check for dlopen
View
@@ -6,9 +6,9 @@
* by the Free Software Foundation.
*/
-#include "ZNCDebug.h"
-#include "FileUtils.h"
-#include "Config.h"
+#include "znc/ZNCDebug.h"
+#include "znc/FileUtils.h"
+#include "znc/Config.h"
#include <cstdlib>
class CConfigTest {
@@ -113,7 +113,7 @@ class CConfigSuccessTest : public CConfigTest {
CConfig::SubConfigMapIterator it2 = conf.BeginSubConfigs();
while (it2 != conf.EndSubConfigs()) {
- map<CString, CConfig::CConfigEntry>::const_iterator it3 = it2->second.begin();
+ map<CString, CConfigEntry>::const_iterator it3 = it2->second.begin();
while (it3 != it2->second.end()) {
sRes += "->" + it2->first + "/" + it3->first + "\n";
View
@@ -6,8 +6,8 @@
* by the Free Software Foundation.
*/
-#include "ZNCString.h"
-#include "ZNCDebug.h"
+#include "znc/ZNCString.h"
+#include "znc/ZNCDebug.h"
static int testEqual(const CString& a, const CString& b, const CString& what)
{
View
@@ -5,14 +5,14 @@ srcdir := @srcdir@
VPATH := @srcdir@
CXX := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I..
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I../include
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
TARGETS := ConfigTest EscapeTest
OBJS := $(addsuffix .o, $(TARGETS))
ZNC_OBJS := Config.o ZNCDebug.o FileUtils.o Utils.o ZNCString.o MD5.o SHA256.o
-ZNC_OBJS := $(addprefix ../, $(ZNC_OBJS))
+ZNC_OBJS := $(addprefix ../src/, $(ZNC_OBJS))
ifneq "$(V)" ""
VERBOSE=1
View
@@ -1,11 +1,10 @@
[Unit]
-Description=An advanced IRC bouncer
+Description=ZNC, an advanced IRC bouncer
After=network.target
[Service]
-ExecStart=/usr/bin/znc
+ExecStart=/usr/bin/znc -f
User=znc
-Type=forking
[Install]
WantedBy=multi-user.target

0 comments on commit 3d280b1

Please sign in to comment.