X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=c38a13ca7b6ba04652e5aadecdf2a1ff7e075356;hb=205136931c9bc0a49601f91c8ab2e07a0b6c34fc;hp=00939774012a59a7401d105cf5dc64ac02c3351d;hpb=056d3ef4c88ba09eabb1fcbf06bdd9fe6e7af4cf;p=netatalk.git

diff --git a/configure.ac b/configure.ac
index 00939774..c38a13ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl configure.in for netatalk
+dnl configure.ac for netatalk
 
 AC_INIT(etc/afpd/main.c)
 
@@ -40,9 +40,6 @@ else
   AC_MSG_RESULT(no)
 fi
 
-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.
@@ -138,6 +135,12 @@ powerpc64:yes | s390x:yes | sparc*:yes | x86_64:yes | i386:yes)
     ;;
 esac
 
+dnl --------------------------------------------------------------------------
+dnl OS specific configuration comes in here:
+dnl --------------------------------------------------------------------------
+
+AC_NETATALK_OS_SPECIFIC
+
 dnl --------------------------------------------------------------------------
 dnl specific configuration comes in here:
 dnl --------------------------------------------------------------------------
@@ -169,9 +172,6 @@ AC_NETATALK_CNID([bdb_required=yes],[bdb_required=no])
 dnl Check for quota support
 AC_NETATALK_CHECK_QUOTA
 
-dnl Check for optional server location protocol support (used by MacOS X)
-AC_NETATALK_SRVLOC
-
 dnl Check for optional Zeroconf support
 AC_NETATALK_ZEROCONF
 
@@ -266,14 +266,6 @@ dnl --------------------------------------------------------------------------
 UAMS_PATH="${uams_path}"
 AC_SUBST(UAMS_PATH)
 
-
-dnl --------------------------------------------------------------------------
-dnl OS specific configuration comes in here:
-dnl --------------------------------------------------------------------------
-
-AC_NETATALK_OS_SPECIFIC
-
-
 dnl --------------------------------------------------------------------------
 dnl drop in includes for top level directory structures here...
 dnl --------------------------------------------------------------------------
@@ -281,14 +273,15 @@ 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 -L\$(top_srcdir)/libevent"
-CFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/sys -I\$(top_srcdir)/libevent/include $CFLAGS"
+LIBS="$LIBS -L\$(top_srcdir)/libatalk"
+CFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/sys $CFLAGS"
 
 
 dnl --------------------------------------------------------------------------
 dnl Last minute substitutions
 dnl --------------------------------------------------------------------------
 
+dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu
 AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
 
@@ -305,16 +298,6 @@ AM_CONDITIONAL(USE_PAM, test x$netatalk_cv_install_pam = xyes)
 AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes)
 AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
 AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$neta_cv_have_openssl != xyes)
-AM_CONDITIONAL(USE_NETBSD, test x$sysv_style = xnetbsd)
-AM_CONDITIONAL(USE_REDHAT_SYSV, test x$sysv_style = xredhat-sysv)
-AM_CONDITIONAL(USE_SUSE_SYSV, test x$sysv_style = xsuse-sysv)
-AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
-AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64)
-AM_CONDITIONAL(USE_SOLARIS, test x$sysv_style = xsolaris)
-AM_CONDITIONAL(USE_GENTOO, test x$sysv_style = xgentoo)
-AM_CONDITIONAL(USE_DEBIAN, test x$sysv_style = xdebian)
-AM_CONDITIONAL(USE_SYSTEMD, test x$sysv_style = xsystemd || test x$sysv_style = xredhat-systemd || test x$sysv_style = xsuse-systemd)
-AM_CONDITIONAL(USE_UNDEF, test x$sysv_style = x)
 AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
 
@@ -327,7 +310,7 @@ AC_OUTPUT([Makefile
 	bin/cnid/Makefile
 	bin/cnid/cnid2_create
 	bin/megatron/Makefile
-    bin/misc/Makefile
+	bin/misc/Makefile
 	bin/uniconv/Makefile
 	config/Makefile
 	config/pam/Makefile
@@ -342,12 +325,10 @@ AC_OUTPUT([Makefile
 	distrib/config/netatalk-config
 	distrib/initscripts/Makefile
 	distrib/m4/Makefile
-	distrib/systemd/Makefile
 	doc/Makefile
 	etc/Makefile
 	etc/afpd/Makefile
 	etc/cnid_dbd/Makefile
-	etc/netalockd/Makefile
 	etc/uams/Makefile
 	include/Makefile
 	include/atalk/Makefile
@@ -362,11 +343,7 @@ AC_OUTPUT([Makefile
 	libatalk/cnid/tdb/Makefile
 	libatalk/compat/Makefile
 	libatalk/dsi/Makefile
-	libatalk/locking/Makefile
-	libatalk/rpc/Makefile
-	libatalk/talloc/Makefile
-	libatalk/tevent/Makefile
-	libatalk/tsocket/Makefile
+	libatalk/iniparser/Makefile
 	libatalk/tdb/Makefile
 	libatalk/unicode/Makefile
 	libatalk/unicode/charsets/Makefile
@@ -379,7 +356,6 @@ AC_OUTPUT([Makefile
 	man/man8/Makefile
 	test/Makefile
 	test/afpd/Makefile
-	test/netalockd/Makefile
 	],
 	[chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*]
 )