From 9b7851e3324a6d74446a1d2b46265eab3874456e Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 1 Jan 2015 18:49:40 +0000 Subject: [PATCH] - Removed obsolete AC_HEADER_TIME git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5266 82007160-df01-0410-b94d-b575c5fd34c7 --- configure | 174 +++++----------------------------------- configure.ac | 9 +-- src/irc.c | 13 +-- src/libopm/src/libopm.c | 12 +-- src/negcache.c | 9 --- src/scan.c | 14 +--- src/setup.h.in | 6 -- src/stats.c | 14 +--- 8 files changed, 29 insertions(+), 222 deletions(-) diff --git a/configure b/configure index ba041d9..cb561a8 100755 --- a/configure +++ b/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for hopm 1.0.0beta1. +# Generated by GNU Autoconf 2.69 for hopm TRUNK. +# +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -272,10 +274,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: bugs@ircd-hybrid.org about your system, including any +$0: error possibly output before this message. Then install +$0: a modern shell, or manually run the script under such a +$0: shell if you do have one." fi exit 1 fi @@ -587,9 +590,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='hopm' PACKAGE_TARNAME='hopm' -PACKAGE_VERSION='1.0.0beta1' -PACKAGE_STRING='hopm 1.0.0beta1' -PACKAGE_BUGREPORT='' +PACKAGE_VERSION='TRUNK' +PACKAGE_STRING='hopm TRUNK' +PACKAGE_BUGREPORT='bugs@ircd-hybrid.org' PACKAGE_URL='' ac_unique_file="src/opercmd.h" @@ -1320,7 +1323,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hopm 1.0.0beta1 to adapt to many kinds of systems. +\`configure' configures hopm TRUNK to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1390,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hopm 1.0.0beta1:";; + short | recursive ) echo "Configuration of hopm TRUNK:";; esac cat <<\_ACEOF @@ -1444,7 +1447,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. +Report bugs to . _ACEOF ac_status=$? fi @@ -1507,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hopm configure 1.0.0beta1 +hopm configure TRUNK generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1781,98 +1784,11 @@ $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hopm $as_me 1.0.0beta1, which was +It was created by hopm $as_me TRUNK, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2738,7 +2654,7 @@ fi # Define the identity of the package. PACKAGE='hopm' - VERSION='1.0.0beta1' + VERSION='TRUNK' cat >>confdefs.h <<_ACEOF @@ -12074,56 +11990,6 @@ CC=$lt_save_CC -for ac_header in sys/time.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIME_H 1 -_ACEOF - -fi - -done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - - for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -13289,7 +13155,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hopm $as_me 1.0.0beta1, which was +This file was extended by hopm $as_me TRUNK, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13349,13 +13215,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -hopm config.status 1.0.0beta1 +hopm config.status TRUNK configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9234035..4468076 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(hopm, [1.0.0beta1]) +AC_INIT([hopm], [TRUNK], [bugs@ircd-hybrid.org]) AC_CONFIG_SRCDIR(src/opercmd.h) AC_CONFIG_HEADER(src/setup.h) AM_INIT_AUTOMAKE() @@ -12,13 +12,6 @@ AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([no suitable C99 compiler found. Aborting.])]) AC_PROG_LIBTOOL -dnl Checks for libraries. - -AC_CHECK_HEADERS(sys/time.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_TIME - dnl check for yacc AC_PROG_INSTALL AC_PROG_YACC diff --git a/src/irc.c b/src/irc.c index 04e32ba..1afd6da 100644 --- a/src/irc.c +++ b/src/irc.c @@ -32,17 +32,8 @@ #include #include #include - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif +#include +#include #include #include diff --git a/src/libopm/src/libopm.c b/src/libopm/src/libopm.c index 9a1d77c..4e3ea07 100644 --- a/src/libopm/src/libopm.c +++ b/src/libopm/src/libopm.c @@ -34,16 +34,8 @@ #include "proxy.h" #include -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif +#include +#include #include #include #include diff --git a/src/negcache.c b/src/negcache.c index f14cabc..abd5010 100644 --- a/src/negcache.c +++ b/src/negcache.c @@ -42,17 +42,8 @@ along with this program; if not, write to: #include #include - -#ifdef TIME_WITH_SYS_TIME #include #include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif #include "irc.h" #include "negcache.h" diff --git a/src/scan.c b/src/scan.c index fbde760..f13137a 100644 --- a/src/scan.c +++ b/src/scan.c @@ -28,18 +28,8 @@ #include #include #include - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include +#include #include #include #include diff --git a/src/setup.h.in b/src/setup.h.in index be66626..96fe728 100644 --- a/src/setup.h.in +++ b/src/setup.h.in @@ -33,9 +33,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H @@ -69,9 +66,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - /* Version number of package */ #undef VERSION diff --git a/src/stats.c b/src/stats.c index 45b7bd5..2e4650e 100644 --- a/src/stats.c +++ b/src/stats.c @@ -26,18 +26,8 @@ along with this program; if not, write to the Free Software #include #include #include - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include +#include #include #include #include -- 2.30.2