From: rufustfirefly Date: Fri, 28 Jul 2000 21:06:37 +0000 (+0000) Subject: automake/autoconf fixes (libatalk now builds supposedly) X-Git-Tag: netatalk-1-5-rc1~759 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=40ea20b77c81f82eba3e3054e87e37d9b56a3b3e automake/autoconf fixes (libatalk now builds supposedly) --- diff --git a/Makefile.am b/Makefile.am index 5a6cf759..ba63ddd6 100644 --- 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 f94ae6d3..1399aafa 100644 --- 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 f410ba69..929bf07f 100644 --- 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 cb67d067..aac565d2 100644 --- 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 073eec0a..1d42f5d0 100644 --- 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 db09a278..0a284590 100644 --- 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 c8438a1f..ce3a62c3 100644 --- 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 15ff6c3d..bc54d76e 100644 --- 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 4369f123..f426bdc8 100644 --- 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 1073f8e9..82adc890 100644 --- 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 18f22d60..489a4202 100644 --- 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 608ab812..f6ef5405 100644 --- 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 32d942c5..93c7118e 100644 --- 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 c737695c..d5840fe7 100644 --- 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 c2f56cb9..5766e254 100644 --- 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 f47428c5..92d6979d 100644 --- 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 9e04f3eb..64473a9f 100644 --- 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 be386a70..c00cbfbb 100644 --- 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 31bfd303..73257f5b 100644 --- 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 40280447..a2bbe472 100644 --- 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 dcd5eec8..e2ad9578 100644 --- 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 263314fb..c9e01e73 100644 --- 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