- Further cleanups to configure.ac

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@5265 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/configure b/configure
index dae9cc35fbfc75aa8692e3aba516e07a010043e8..508aa3aaa22a173fe6fd42c37b5d5dfdfd8ed76f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /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 1.0.0beta2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='hopm'
 PACKAGE_TARNAME='hopm'
-PACKAGE_VERSION='1.0.0beta1'
-PACKAGE_STRING='hopm 1.0.0beta1'
+PACKAGE_VERSION='1.0.0beta2'
+PACKAGE_STRING='hopm 1.0.0beta2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1320,7 +1320,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 1.0.0beta2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1390,7 +1390,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 1.0.0beta2:";;
    esac
   cat <<\_ACEOF
 
@@ -1507,7 +1507,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-hopm configure 1.0.0beta1
+hopm configure 1.0.0beta2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1872,7 +1872,7 @@ 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 1.0.0beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2738,7 +2738,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hopm'
- VERSION='1.0.0beta1'
+ VERSION='1.0.0beta2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12074,13 +12074,12 @@ CC=$lt_save_CC
 
 
 
-for ac_header in fcntl.h sys/time.h unistd.h
+for ac_header in sys/time.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_TIME_H 1
 _ACEOF
 
 fi
@@ -12123,41 +12122,6 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-                                    int *p = &tm.tm_sec;
-                                    return !p;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_struct_tm=time.h
-else
-  ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
 
 
 for ac_prog in 'bison -y' byacc
@@ -12550,7 +12514,7 @@ fi
 fi
 
 
-for ac_func in strlcpy strlcat socket
+for ac_func in strlcpy strlcat
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13325,7 +13289,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 1.0.0beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13391,7 +13355,7 @@ _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 1.0.0beta2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 511ff7b2c6a4e9a5e1272839ff8c70815632d16e..c1874ba0e90dd704ea4a23156fc2e9caed558c4d 100644 (file)
--- 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, [1.0.0beta2])
 AC_CONFIG_SRCDIR(src/opercmd.h)
 AC_CONFIG_HEADER(src/setup.h)
 AM_INIT_AUTOMAKE()
@@ -14,11 +14,10 @@ AC_PROG_LIBTOOL
 
 dnl Checks for libraries.
 
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(sys/time.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_TIME
-AC_STRUCT_TM
 
 dnl check for yacc
 AC_PROG_INSTALL
@@ -32,7 +31,7 @@ AC_SEARCH_LIBS([socket],[socket],,[AC_MSG_ERROR([socket library not found])])
 AC_CHECK_FUNC(getaddrinfo, [], AC_SEARCH_LIBS(getaddrinfo, nsl))
 AC_CHECK_FUNC(getnameinfo, [], AC_SEARCH_LIBS(getnameinfo, nsl))
 
-AC_CHECK_FUNCS(strlcpy strlcat socket)
+AC_CHECK_FUNCS(strlcpy strlcat)
 
 dnl AIX fun
 AC_C_BIGENDIAN

diff --git a/src/libopm/src/inet.h b/src/libopm/src/inet.h
index d7d03d8ce7e38a7f379eae747759de033caa3437..de62b94468e47c9ab50a63daa28dd044cef97636 100644 (file)
--- a/src/libopm/src/inet.h
+++ b/src/libopm/src/inet.h
@@ -6,9 +6,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 #include <sys/types.h>
 
 typedef struct _opm_sockaddr opm_sockaddr;

diff --git a/src/setup.h.in b/src/setup.h.in
index a08173db4dbc4ae63006b72a059b230f608354ed..be6662686f63df23f90b5364977822a5716bba3c 100644 (file)
--- a/src/setup.h.in
+++ b/src/setup.h.in
@@ -6,18 +6,12 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -78,9 +72,6 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
 /* Version number of package */
 #undef VERSION