automake/autoconf fixes (libatalk now builds supposedly)

diff --git a/Makefile.am b/Makefile.am
index 5a6cf759cd7af449295ec60c35afc1d1c403b384..ba63ddd66ed24b14e896910afc132ee6489010c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for top level of netatalk package
 
-SUBDIRS = libatalk include bin etc man
-# these later : config contrib distrib
+SUBDIRS = libatalk bin etc man
+# these later : config contrib distrib include
 
 EXTRA_DIST = BUGS CHANGES CONTRIBUTORS COPYRIGHT ChangeLog README README.ASUN TODO VERSION services.atalk
 

diff --git a/acconfig.h b/acconfig.h
index f94ae6d39732f0fb06bcdb69427806ec9d3909e7..1399aafaf6c8bdc534f334537a80d18ac0fce132 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1 +1,2 @@
 #undef SHADOWPW
+#undef TCPWRAP

diff --git a/bin/adv1tov2/Makefile.am b/bin/adv1tov2/Makefile.am
index f410ba69f1214840dcaff02a38ca79884e01e055..929bf07fd7065304f1ad679fb9009f575d59fd09 100644 (file)
--- a/bin/adv1tov2/Makefile.am
+++ b/bin/adv1tov2/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = adv1tov2
 adv1tov2_SOURCES = adv1tov2.c
 adv1tov2_LDADD = ../../libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/bin/aecho/Makefile.am b/bin/aecho/Makefile.am
index cb67d067c0571cca1aa7b208af92c2dbec409f83..aac565d2b4707185e481d0c914d0c41e14b258f2 100644 (file)
--- a/bin/aecho/Makefile.am
+++ b/bin/aecho/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = aecho
 aecho_SOURCES = aecho.c
 aecho_LDADD = ../../libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index 073eec0a2c3cfbd74f53c1e0a750452a77bd9f9c..1d42f5d030ef242de2a0ab7dc7e6b17ed26c0aef 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = afppasswd
 afppasswd_SOURCES = afppasswd.c
 afppasswd_LDADD = ../../libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/bin/getzones/Makefile.am b/bin/getzones/Makefile.am
index db09a27848d880780eeebd0407e4a10d3bfae323..0a2845901a1ca0bc67b3ddb093de9e1999f155a8 100644 (file)
--- a/bin/getzones/Makefile.am
+++ b/bin/getzones/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = getzones
 getzones_SOURCES = getzones.c
 getzones_LDADD = ../../libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/bin/megatron/Makefile.am b/bin/megatron/Makefile.am
index c8438a1f2373275932e13598001f8ca71207485a..ce3a62c33035e2abb5cb3d96e91c7d91933e744e 100644 (file)
--- a/bin/megatron/Makefile.am
+++ b/bin/megatron/Makefile.am
@@ -7,7 +7,7 @@ megatron_LDADD = ../../libatalk/libatalk.a
 
 noinst_HEADERS = megatron.h
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys
 
 # ************************************************
 # FIXME! FIXME! Links need to work for:

diff --git a/bin/nbp/Makefile.am b/bin/nbp/Makefile.am
index 15ff6c3d1a87a4a8643fa0048383e1d90f1627b4..bc54d76e4fe5fb280b67eb6bf3febca4fad3558e 100644 (file)
--- a/bin/nbp/Makefile.am
+++ b/bin/nbp/Makefile.am
@@ -11,4 +11,4 @@ nbprgstr_LDADD = ../../libatalk/libatalk.a
 nbpunrgstr_SOURCES = nbpunrgstr.c
 nbpunrgstr_LDADD = ../../libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/bin/pap/Makefile.am b/bin/pap/Makefile.am
index 4369f12391f557a0105e801b4c732bd60cd3e044..f426bdc8c6687e15110f3891cfc3067e954ada9c 100644 (file)
--- a/bin/pap/Makefile.am
+++ b/bin/pap/Makefile.am
@@ -8,4 +8,4 @@ pap_LDADD = ../../libatalk/libatalk.a
 papstatus_SOURCES = papstatus.c
 papstatus_LDADD = ../../libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/bin/psorder/Makefile.am b/bin/psorder/Makefile.am
index 1073f8e9d4c4ebfcda8f4b80cf023946044c8a72..82adc89088520e335cba1afec54abec0ccc9ca1c 100644 (file)
--- a/bin/psorder/Makefile.am
+++ b/bin/psorder/Makefile.am
@@ -7,4 +7,4 @@ psorder_LDADD = ../../libatalk/libatalk.a
 
 noinst_HEADERS = psorder.h pa.h
 
-CFLAGS = @CFLAGS@ -I../../include
+CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/configure.in b/configure.in
index 18f22d6090b67420925b3a64ab0a83081aae0cfe..489a420206dcf0b767967383316bc74ad606340d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -117,6 +117,43 @@ AC_ARG_ENABLE(shadow,
        AC_DEFINE(SHADOWPW)
 )
 
+AC_ARG_ENABLE(tcp-wrappers,
+       [  --with-tcp-wrappers     enable TCP wrappers support],
+       AC_DEFINE(TCPWRAP)
+)
+
 dnl List of Makefiles to generate
 
-AC_OUTPUT(libatalk/nbp/Makefile etc/psf/Makefile sys/ultrix/Makefile libatalk/compat/Makefile sys/openbsd/Makefile bin/Makefile man/man4/Makefile etc/atalkd/Makefile etc/Makefile sys/linux/Makefile man/man8/Makefile etc/uams/Makefile etc/afpd/nls/Makefile libatalk/Makefile bin/megatron/Makefile sys/sunos/Makefile bin/psorder/Makefile sys/osx/Makefile bin/aecho/Makefile sys/freebsd/Makefile sys/solaris/Makefile etc/papd/Makefile libatalk/util/Makefile bin/afppasswd/Makefile Makefile libatalk/dsi/Makefile bin/getzones/Makefile libatalk/asp/Makefile libatalk/atp/Makefile man/man1/Makefile man/man3/Makefile man/Makefile bin/adv1tov2/Makefile include/Makefile etc/afpd/Makefile bin/nbp/Makefile bin/pap/Makefile sys/generic/Makefile sys/netbsd/Makefile libatalk/adouble/Makefile libatalk/cnid/Makefile libatalk/netddp/Makefile)
+AC_OUTPUT([Makefile
+       bin/Makefile
+       bin/adv1tov2/Makefile
+       bin/aecho/Makefile
+       bin/afppasswd/Makefile
+       bin/getzones/Makefile
+       bin/megatron/Makefile
+       bin/nbp/Makefile
+       bin/pap/Makefile
+       bin/psorder/Makefile
+       etc/Makefile
+       etc/afpd/Makefile
+       etc/afpd/nls/Makefile
+       etc/atalkd/Makefile
+       etc/uams/Makefile
+       etc/papd/Makefile
+       etc/psf/Makefile
+       libatalk/Makefile
+       libatalk/adouble/Makefile
+       libatalk/asp/Makefile
+       libatalk/atp/Makefile
+       libatalk/compat/Makefile
+       libatalk/dsi/Makefile
+       libatalk/nbp/Makefile
+       libatalk/netddp/Makefile
+       libatalk/util/Makefile
+       man/Makefile
+       man/man1/Makefile
+       man/man3/Makefile
+       man/man4/Makefile
+       man/man8/Makefile
+])
+

diff --git a/include/atalk/Makefile.am b/include/atalk/Makefile.am
index 608ab812fe75f9833943de4fc39a5d4a5626e02a..f6ef5405e36ab154edca682c0a0dd6efe3f9dd96 100644 (file)
--- a/include/atalk/Makefile.am
+++ b/include/atalk/Makefile.am
@@ -1,3 +1,5 @@
 # Makefile.am for include/atalk/
 
+bin_PROGRAMS = 
+
 include_HEADERS = adouble.h aep.h afp.h asp.h atp.h cnid.h compat.h ddp.h dsi.h nbp.h netddp.h pap.h paths.h rtmp.h server_child.h uam.h util.h zip.h

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index 32d942c5d489e8a4751fdc713932e74b858180ea..93c7118e6e0ec1b9e139ac5f04f66d84c09b2c97 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -1,8 +1,13 @@
 # Makefile.am for libatalk/
 
-SUBDIRS = adouble asp atp cnid compat dsi nbp netddp pap util
+SUBDIRS = adouble asp atp compat dsi nbp netddp util
 
 lib_LIBRARIES = libatalk.a
 
+LIBATALK_DEPS = asp/libasp.la atp/libatp.la nbp/libnbp.la adouble/libadouble.la dsi/libdsi.la util/libutil.la compat/libcompat.la netddp/libnetddp.la
+
 libatalk_a_SOURCES =
-libatalk_a_LIBADD = asp/libasp.a atp/libatp.a nbp/libnbp.a adouble/libadouble.a dsi/libdsi.a util/libutil.a compat/libcompat.a netddp/libnetddp.a
+libatalk_a_LIBADD = ${LIBATALK_DEPS}
+
+libatalk.a: ${LIBATALK_DEPS}
+       ${LIBTOOL} --mode=link ${LIBATALK_DEPS} -o libatalk.a

diff --git a/libatalk/asp/Makefile.am b/libatalk/asp/Makefile.am
index c737695c941d2ee11cadcd6877c895cc2d0181da..d5840fe7be14a139616a522e9b2d8086f1915fec 100644 (file)
--- a/libatalk/asp/Makefile.am
+++ b/libatalk/asp/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for libatalk/asp/
 
-noinst_LIBRARIES = libasp.a
+noinst_LTLIBRARIES = libasp.la
 
-libasp_a_SOURCES = asp_attn.c asp_close.c asp_cmdreply.c asp_getreq.c asp_getsess.c asp_init.c asp_write.c asp_shutdown.c asp_tickle.c 
+libasp_la_SOURCES = asp_attn.c asp_close.c asp_cmdreply.c asp_getreq.c asp_getsess.c asp_init.c asp_write.c asp_shutdown.c asp_tickle.c 
 
 noinst_HEADERS = asp_child.h
 

diff --git a/libatalk/atp/Makefile.am b/libatalk/atp/Makefile.am
index c2f56cb937d31932411427d41f373bd90018439f..5766e254ee05091ea3812a36184271679553d6ab 100644 (file)
--- a/libatalk/atp/Makefile.am
+++ b/libatalk/atp/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for libatalk/atp/
 
-noinst_LIBRARIES = libatp.a
+noinst_LTLIBRARIES = libatp.la
 
-libatp_a_SOURCES = atp_bprint.c atp_bufs.c atp_close.c atp_open.c atp_packet.c atp_rreq.c atp_rresp.c atp_rsel.c atp_sreq.c atp_sresp.c 
+libatp_la_SOURCES = atp_bprint.c atp_bufs.c atp_close.c atp_open.c atp_packet.c atp_rreq.c atp_rresp.c atp_rsel.c atp_sreq.c atp_sresp.c 
 
 noinst_HEADERS = atp_internals.h
 

diff --git a/libatalk/cnid/Makefile.am b/libatalk/cnid/Makefile.am
index f47428c5a3e8524b0f4a3251f30d7434ccc8dd6b..92d6979d3d0d94739dfc50843fb9776d5f8f0ef7 100644 (file)
--- a/libatalk/cnid/Makefile.am
+++ b/libatalk/cnid/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for libatalk/cnid/
 
-noinst_LIBRARIES = libcnid.a
+noinst_LTLIBRARIES = libcnid.la
 
-libcnid_a_SOURCES = cnid_add.c cnid_close.c cnid_delete.c cnid_get.c cnid_lookup.c cnid_meta.c cnid_nextid.c cnid_open.c cnid_resolve.c cnid_update.c
+libcnid_la_SOURCES = cnid_add.c cnid_close.c cnid_delete.c cnid_get.c cnid_lookup.c cnid_meta.c cnid_nextid.c cnid_open.c cnid_resolve.c cnid_update.c
 
 noinst_HEADERS = cnid_meta.h cnid_private.h 
 

diff --git a/libatalk/compat/Makefile.am b/libatalk/compat/Makefile.am
index 9e04f3eb12deb0187834a5a86d4c9f5f225335cd..64473a9f405cad298916370e564e6f4b186e0fec 100644 (file)
--- a/libatalk/compat/Makefile.am
+++ b/libatalk/compat/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for libatalk/compat/
 
-noinst_LIBRARIES = libcompat.a
+noinst_LTLIBRARIES = libcompat.la
 
-libcompat_a_SOURCES = mktemp.c getusershell.c strcasecmp.c strstr.c flock.c strdup.c inet_aton.c rquota_xdr.c 
+libcompat_la_SOURCES = mktemp.c getusershell.c strcasecmp.c strstr.c flock.c strdup.c inet_aton.c rquota_xdr.c 
 
 CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
index be386a709b4814727b7ba8c2069c87178fa6c3ea..c00cbfbba7f6164be5da8d93bad12eb01d02536e 100644 (file)
--- a/libatalk/dsi/Makefile.am
+++ b/libatalk/dsi/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for libatalk/dsi/
 
-noinst_LIBRARIES = libdsi.a
+noinst_LTLIBRARIES = libdsi.la
 
-libdsi_a_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
+libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
 
 noinst_HEADERS = dsi_private.h
 

diff --git a/libatalk/nbp/Makefile.am b/libatalk/nbp/Makefile.am
index 31bfd30385b9d9a4cc7429e18a455dfc65f44102..73257f5b8702e4a582930fd4c67a9ef1f4a49b85 100644 (file)
--- a/libatalk/nbp/Makefile.am
+++ b/libatalk/nbp/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for libatalk/nbp/
 
-noinst_LIBRARIES = libnbp.a
+noinst_LTLIBRARIES = libnbp.la
 
-libnbp_a_SOURCES = nbp_util.c nbp_lkup.c nbp_rgstr.c nbp_unrgstr.c
+libnbp_la_SOURCES = nbp_util.c nbp_lkup.c nbp_rgstr.c nbp_unrgstr.c
 
 noinst_HEADERS = nbp_conf.h
 

diff --git a/libatalk/netddp/Makefile.am b/libatalk/netddp/Makefile.am
index 40280447d7dd298c63de1a9a2ce3d77ec83c9f7f..a2bbe472ddf18ded521106a84563239304d7482c 100644 (file)
--- a/libatalk/netddp/Makefile.am
+++ b/libatalk/netddp/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for libatalk/netddp/
 
-noinst_LIBRARIES = libnetddp.a
+noinst_LTLIBRARIES = libnetddp.la
 
-libnetddp_a_SOURCES = netddp_open.c netddp_sendto.c netddp_recvfrom.c
+libnetddp_la_SOURCES = netddp_open.c netddp_sendto.c netddp_recvfrom.c
 
 CFLAGS = @CFLAGS@ -I../../include -I../../sys

diff --git a/libatalk/pap/Makefile.am b/libatalk/pap/Makefile.am
index dcd5eec8a09904c68b7aa166862560426babfb5d..e2ad95785bfa48060d765324486b206522b6eb71 100644 (file)
--- a/libatalk/pap/Makefile.am
+++ b/libatalk/pap/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for libatalk/pap/
 
-noinst_LIBRARIES = libpap.a
+noinst_LTLIBRARIES = libpap.la
 
-libpap_a_SOURCES = pap_close.c pap_init.c pap_open.c pap_read.c pap_sendstatus.c pap_slinit pap_tickle.c
+libpap_la_SOURCES = pap_close.c pap_init.c pap_open.c pap_read.c pap_sendstatus.c pap_slinit pap_tickle.c
 
 noinst_HEADERS = pap_child.h
 

diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index 263314fbb6bda973ceda0d54fb4524211b681302..c9e01e73804150837fe62700adf6d02f4cfdbbc9 100644 (file)
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for libatalk/util/
 
-noinst_LIBRARIES = libutil.a
+noinst_LTLIBRARIES = libutil.la
 
-libutil_a_SOURCES = atalk_addr.c strdicasecmp.c server_child.c server_lock.c module.c bprint.c getiface.c
+libutil_la_SOURCES = atalk_addr.c strdicasecmp.c server_child.c server_lock.c module.c bprint.c getiface.c
 
 CFLAGS = @CFLAGS@ -I../../include -I../../sys