X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=71655d587e1834187740f6f70251ac36081f006c;hb=9c8a21a5a13808bab520bd257b3d0a6fe16c6b07;hp=293202d300b95efae4412d6db22d5ef521d81d46;hpb=d084c2987bc4d0bf51b893c8d53098081382fec8;p=netatalk.git

diff --git a/configure.in b/configure.in
index 293202d3..71655d58 100644
--- a/configure.in
+++ b/configure.in
@@ -23,40 +23,30 @@ AC_PROG_GREP
 AC_PROG_PS
 AM_PROG_CC_C_O
 
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+
 dnl Request SUSv3 standard interfaces plus anything else the platform may have
 CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D_GNU_SOURCE"
 
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h time.h stdarg.h)
-AC_CHECK_HEADERS(mntent.h syslog.h unistd.h termios.h ufs/quota.h)
-AC_CHECK_HEADERS(netdb.h sgtty.h mount.h statfs.h dlfcn.h errno.h langinfo.h locale.h)
-AC_CHECK_HEADERS(sys/param.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h)
-AC_CHECK_HEADERS(sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h)
-AC_CHECK_HEADERS(sys/termios.h sys/types.h sys/errno.h sys/uio.h sys/filio.h)
-AC_CHECK_HEADER(sys/cdefs.h,,
-	AC_MSG_RESULT([enabling generic cdefs.h from tree])
-	CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
-)
+dnl Configure libevent
+AC_CONFIG_SUBDIRS([libevent])
 
+dnl Checks for header files, some checks are obsolete, unfortunately the code
+dnl uses the resulting macros, so the code has to cleaned up too before
+dnl we can remove the checks here.
+AC_CHECK_HEADERS(mntent.h unistd.h termios.h ufs/quota.h)
+AC_CHECK_HEADERS(netdb.h sgtty.h statfs.h dlfcn.h langinfo.h locale.h)
+AC_CHECK_HEADERS(sys/param.h sys/fcntl.h sys/termios.h)
+AC_CHECK_HEADERS(sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h)
+dnl Checks for header files, conformed to be required as of 2011
+AC_CHECK_HEADERS(sys/epoll.h)
 AC_CHECK_HEADERS([sys/mount.h], , , 
 [#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 ])
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_STRUCT_ST_RDEV
-AC_HEADER_TIME
-AC_STRUCT_TM
 
 dnl --------------------------------------------------------------------------
 dnl check if dlsym needs to add an underscore, uses libtool macros 
@@ -73,6 +63,7 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
 
 dnl these tests have been comfirmed to be needed in 2011
 AC_CHECK_FUNC(renameat, AC_DEFINE([_ATFILE_SOURCE], 1, AT file source)) 
+AC_CHECK_FUNC(epoll_create, AC_DEFINE([HAVE_EPOLL], 1, Whether Linux epoll is available)) 
 AC_CHECK_FUNCS(backtrace_symbols dirfd getusershell pread pwrite pselect)
 AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen)
 
@@ -86,9 +77,6 @@ fi
 AC_SUBST(PTHREAD_LIBS)
 AC_CACHE_SAVE
 
-dnl Checks for (v)snprintf
-NETATALK_SNPRINTF_CHECK
-
 dnl --------------------------------------------------------------------------
 dnl 64bit platform check
 dnl --------------------------------------------------------------------------
@@ -543,8 +531,8 @@ dnl --------------------------------------------------------------------------
 dnl Note: $(top_srcdir)/include should be added before all other includes
 dnl       so that includes from that directory a preferred to includes from
 dnl       /usr/include or similar places.
-LIBS="$LIBS -L\$(top_srcdir)/libatalk"
-CFLAGS="-I\$(top_srcdir)/include $CFLAGS -I\$(top_srcdir)/sys"
+LIBS="$LIBS -L\$(top_srcdir)/libatalk -L\$(top_srcdir)/libevent"
+CFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/sys -I\$(top_srcdir)/libevent/include $CFLAGS"
 
 AC_DEFINE(OPEN_NOFOLLOW_ERRNO, ELOOP, errno returned by open with O_NOFOLLOW)
 
@@ -777,7 +765,7 @@ if test x"$this_os" = "xsolaris"; then
 
 	solaris_module=no
 	AC_MSG_CHECKING([if we can build Solaris kernel module])
-	if test -x /usr/ccs/bin/ld && test x$netatalk_cv_ddp_enabled = yes ; then
+	if test -x /usr/ccs/bin/ld && test x"$netatalk_cv_ddp_enabled" = x"yes" ; then
 		solaris_module=yes
 	fi
 	AC_MSG_RESULT([$solaris_module])
@@ -1349,6 +1337,8 @@ AC_OUTPUT([Makefile
 	libatalk/netddp/Makefile
 	libatalk/util/Makefile
 	libatalk/talloc/Makefile
+	libatalk/tevent/Makefile
+	libatalk/tsocket/Makefile
 	libatalk/tdb/Makefile
 	libatalk/unicode/Makefile
 	libatalk/unicode/charsets/Makefile
@@ -1361,8 +1351,6 @@ AC_OUTPUT([Makefile
 	man/man5/Makefile
 	man/man8/Makefile
 	sys/Makefile
-	sys/generic/Makefile
-	sys/generic/sys/Makefile
 	sys/netatalk/Makefile
 	sys/netbsd/Makefile
 	sys/netbsd/netatalk/Makefile