mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-11-13 20:17:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'autoconf-update'

Browse Source 
Update GNU autoconf and automake infrastructure.
Tested on modern systems as well as Apple A/UX :-)

* autoconf-update:
  AUTOMAKE_OPTIONS: fix ansi2knr option, include path
  Don't use AC_FUNC_MALLOC and AC_FUNC_REALLOC
  Make our own targets "silent", if enabled
  configure.in: use AC_CHECK_{FUNCS|HEADERS}_ONCE
  Updated config.{guess|sub} to version 2012-08-14
  Make autogen.sh more verbose when VERBOSE=1 is set
  configure.in: use AC_SEARCH_LIBS (not AC_CHECK_LIB)
  configure.in: use AS_HELP_STRING macro
  configure.in: use AC_CANONICAL_HOST (not AC_CANONICAL_TARGET)
  configure.in: inttypes.h is an optional header file
  Use HAVE_SETSID #define when testing for setsid()
  Don't include <stdint.h>, it is included by "portab.h"
  Don't check type.h availability, it is required
  configure.in: Use AC_CONFIG_FILES macro
  configure.in: Don't use AC_C_PROTOTYPES
  configure.in: Update checks for required and optional features
  configure.in: require autoconf 2.67 and automake 1.11
  configure.in: sort some lists (templates, output, ...)
This commit is contained in:
Alexander Barton
2012-09-16 13:05:23 +02:00
parent 85abfd84be 5c160921ff
commit 107bfdc821
13 changed files with 179 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ipaddr/Makefile.am
View File

@@ -1,4 +1,9 @@
AUTOMAKE_OPTIONS = ansi2knr
#
# ipaddr/Makefile.am
# (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
#
AUTOMAKE_OPTIONS = ../portab/ansi2knr
INCLUDES = -I$(srcdir)/../portab

4
src/ngircd/conf.c
View File

@@ -18,6 +18,7 @@
#include "imp.h"
#include <assert.h>
#include <ctype.h>
#include <errno.h>
#ifdef PROTOTYPES
# include <stdarg.h>
@@ -34,9 +35,6 @@
#include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_CTYPE_H
# include <ctype.h>
#endif
#include "array.h"
#include "ngircd.h"

4
src/ngircd/conn.c
View File

@@ -47,10 +47,6 @@
# include <netinet/ip.h>
#endif
#ifdef HAVE_STDINT_H
# include <stdint.h> /* e.g. for Mac OS X */
#endif
#ifdef TCPWRAP
# include <tcpd.h> /* for TCP Wrappers */
#endif

4
src/ngircd/login.c
View File

@@ -163,8 +163,8 @@ Login_User_PostAuth(CLIENT *Client)
return false;
if (!IRC_WriteStrClient
(Client, RPL_YOURHOST_MSG, Client_ID(Client),
Client_ID(Client_ThisServer()), PACKAGE_VERSION, TARGET_CPU,
TARGET_VENDOR, TARGET_OS))
Client_ID(Client_ThisServer()), PACKAGE_VERSION, HOST_CPU,
HOST_VENDOR, HOST_OS))
return false;
if (!IRC_WriteStrClient
(Client, RPL_CREATED_MSG, Client_ID(Client), NGIRCd_StartStr))

8
src/ngircd/ngircd.c
View File

@@ -406,11 +406,11 @@ Fill_Version( void )
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "-", sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, TARGET_CPU, sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, HOST_CPU, sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, TARGET_VENDOR, sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, HOST_VENDOR, sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, HOST_OS, sizeof( NGIRCd_VersionAddition ));
snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
@@ -716,7 +716,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
}
/* New child process */
#ifndef NeXT
#ifdef HAVE_SETSID
(void)setsid();
#else
setpgrp(0, getpid());

14
src/portab/portab.h
View File

@@ -1,6 +1,6 @@
/*
* ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
* Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -120,16 +120,16 @@ typedef unsigned char bool;
/* target constants */
#ifndef TARGET_OS
#define TARGET_OS "unknown"
#ifndef HOST_OS
#define HOST_OS "unknown"
#endif
#ifndef TARGET_CPU
#define TARGET_CPU "unknown"
#ifndef HOST_CPU
#define HOST_CPU "unknown"
#endif
#ifndef TARGET_VENDOR
#define TARGET_VENDOR "unknown"
#ifndef HOST_VENDOR
#define HOST_VENDOR "unknown"
#endif

6
src/tool/Makefile.am
View File

@@ -1,6 +1,6 @@
#
# ngIRCd -- The Next Generation IRC Daemon
# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -8,10 +8,8 @@
# (at your option) any later version.
# Please read the file COPYING, README and AUTHORS for more information.
#
# $Id: Makefile.am,v 1.1 2003/01/13 12:20:16 alex Exp $
#
AUTOMAKE_OPTIONS = ansi2knr
AUTOMAKE_OPTIONS = ../portab/ansi2knr
INCLUDES = -I$(srcdir)/../portab