Merge branch 'no-range-matching' of git://arthur.barton.de/ngircd-alex

* 'no-range-matching' of git://arthur.barton.de/ngircd-alex:
  Remove "range matching" functionality

diff --git a/configure.ng b/configure.ng
index 0b0a6588d6c1ec3cf8e3ac1949b23e2be57938cd..1e141c9f7f82e8a366c93979651f8b0b0f5eeb43 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -66,6 +66,7 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
 AC_PROG_RANLIB
 
 # -- Compiler Features --
@@ -466,8 +467,12 @@ AC_ARG_WITH(tcp-wrappers,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_MSG_CHECKING(for hosts_access)
+                       saved_LIBS="$LIBS"
                        LIBS="-lwrap $LIBS"
+                       LIBS_END="-lwrap $LIBS_END"
                        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <tcpd.h>
 int allow_severity = 0;
 int deny_severity = 0;
@@ -481,6 +486,7 @@ int deny_severity = 0;
                                AC_MSG_RESULT(no)
                                AC_MSG_ERROR([Can't enable TCP wrappers!])
                        ])
+                       LIBS="$saved_LIBS"
                fi
        ]
 )
@@ -636,9 +642,12 @@ AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu" )
 AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" )
 AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" )
 
-# Add additional CFLAGS, eventually specified on the command line, but after
-# running this configure script. Useful for "-Werror" for example.
+# Add additional CFLAGS, LDFLAGS and LIBS which were specified on the command
+# line or by some tests from above, but after running this script. Useful for
+# adding "-Werror", for example:
 test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
+test -n "$LDFLAGS_END" && LDFLAGS="$LDFLAGS $LDFLAGS_END"
+test -n "$LIBS_END" && LIBS="$LIBS $LIBS_END"
 
 # -- Generate files --
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 04f74b6059acd132336f5527477d533297c6989a..27942dd3d05c32c0326253d6cadece421506110e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -54,11 +54,11 @@ maintainer-clean-local:
 all: $(generated_docs)
 
 install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+       $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir)
        @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
          make install-config; \
         fi
-       $(mkinstalldirs) $(DESTDIR)$(docdir)
+       $(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
        for f in $(static_docs) $(toplevel_docs); do \
          $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
         done

diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c
index b104739e26b64c473c618873fd0d27eb97f0b5ed..3602feecf25819a882b7655a6cfba88bf2600322 100644 (file)
--- a/src/portab/portabtest.c
+++ b/src/portab/portabtest.c
@@ -24,6 +24,8 @@
 
 #include "exp.h"
 
+int allow_severity = 0, deny_severity = 0;
+
 static void
 Panic(char *Reason)
 {