From 6b8324c74f997879b61482aa75c5b2e9dd146a8f Mon Sep 17 00:00:00 2001 From: rufustfirefly Date: Mon, 31 Jul 2000 20:53:19 +0000 Subject: [PATCH] More automake/autoconf updates (megatron is disabled, but netatalk builds) --- acconfig.h | 1 + autogen.sh | 2 ++ configure.in | 24 ++++++++++++++++++++++++ etc/afpd/Makefile.am | 22 ++++++++++------------ etc/afpd/nls/Makefile.am | 2 +- etc/atalkd/Makefile.am | 6 ++++-- etc/papd/Makefile.am | 7 +++++-- etc/psf/Makefile.am | 11 ++++++++--- etc/uams/Makefile.am | 17 +++++++++-------- libatalk/adouble/Makefile.am | 4 ++-- 10 files changed, 66 insertions(+), 30 deletions(-) diff --git a/acconfig.h b/acconfig.h index 1399aafa..be97eaf0 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,2 +1,3 @@ #undef SHADOWPW #undef TCPWRAP +#undef USE_FLOCK_LOCKS diff --git a/autogen.sh b/autogen.sh index 6408da2c..cec7ec6c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,3 +2,5 @@ libtoolize --force && aclocal $ACLOCAL_FLAGS && autoheader && automake --add-missing && autoconf +# just in case automake generated errors... +autoconf diff --git a/configure.in b/configure.in index 489a4202..d6b2b371 100644 --- a/configure.in +++ b/configure.in @@ -8,6 +8,9 @@ AC_SUBST(NETATALK_VERSION) AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION}) AM_CONFIG_HEADER(config.h) +dnl Reset locations to proper places +AC_PREFIX_DEFAULT(/usr) + dnl Checks for programs. AC_PROG_AWK AC_PROG_CC @@ -112,16 +115,37 @@ dnl -------------------------------------------------------------------------- dnl specific configuration comes in here: dnl -------------------------------------------------------------------------- +AC_ARG_ENABLE(config-dir, + [ --with-config-dir=path path to config files (default is /etc/atalk)], + config_dir="$withval", config_dir="/etc/atalk") +AC_DEFINE_UNQUOTED(CONFIG_DIR, "$config_dir", + [path to config dir (default is /etc/atalk)]) +CONFIG_DIR="$config_dir" +AC_SUBST(CONFIG_DIR) + AC_ARG_ENABLE(shadow, [ --with-shadow enable shadow password support], AC_DEFINE(SHADOWPW) ) +AC_ARG_ENABLE(flock-locks, + [ --with-flock-locks enable flock locks support], + AC_DEFINE(USE_FLOCK_LOCKS) +) + AC_ARG_ENABLE(tcp-wrappers, [ --with-tcp-wrappers enable TCP wrappers support], AC_DEFINE(TCPWRAP) ) +AC_ARG_ENABLE(uams-path, + [ --with-uams-path=path path to UAMs (default is /etc/atalk/uams)], + uams_path="$withval", uams_path="/etc/atalk/uams") +AC_DEFINE_UNQUOTED(UAMS_PATH, "$uams_path", + [path to UAMs (default is /etc/atalk/uams)]) +UAMS_PATH="$uams_path" +AC_SUBST(UAMS_PATH) + dnl List of Makefiles to generate AC_OUTPUT([Makefile diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am index b7a9f3d0..dc8f9d69 100644 --- a/etc/afpd/Makefile.am +++ b/etc/afpd/Makefile.am @@ -5,18 +5,16 @@ SUBDIRS = nls sbin_PROGRAMS = afpd afpd_SOURCES = unix.c ofork.c main.c switch.c auth.c volume.c directory.c file.c enumerate.c desktop.c filedir.c fork.c appl.c gettok.c status.c afp_options.c afp_asp.c afp_dsi.c messages.c config.c nfsquota.c codepage.c quota.c uam.c afs.c -afpd_LDADD = afpd_options.o +afpd_LDADD = ../../libatalk/libatalk.a -latalk noinst_HEADERS = auth.h codepage.h config.h desktop.h directory.h file.h filedir.h fork.h globals.h icon.h misc.h status.h switch.h uam_auth.h unix.h volume.h -afpd_options.o: afp_options.c - ${COMPILE} \ - -D_PATH_AFPDDEFVOL=\"${ETCDIR}/AppleVolumes.default\" \ - -D_PATH_AFPDSYSVOL=\"${ETCDIR}/AppleVolumes.system\" \ - -D_PATH_AFPDPWFILE=\"${ETCDIR}/afpd.passwd\" \ - -D_PATH_AFPDCONF=\"${ETCDIR}/afpd.conf\" \ - -D_PATH_AFPDUAMPATH=\"${RESDIR}/uams/\" \ - -D_PATH_AFPDNLSPATH=\"${RESDIR}/nls/\" \ - -o afp_options.o -c afp_options.c - -CFLAGS = @CFLAGS@ -I../../include +CFLAGS = @CFLAGS@ -I../../include -I../../sys \ + -D_PATH_AFPDDEFVOL=\"$(CONFIG_DIR)/AppleVolumes.default\" \ + -D_PATH_AFPDSYSVOL=\"$(CONFIG_DIR)/AppleVolumes.system\" \ + -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afpd.passwd\" \ + -D_PATH_AFPDCONF=\"$(CONFIG_DIR)/afpd.conf\" \ + -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \ + -D_PATH_AFPDNLSPATH=\"$(CONFIG_DIR)/nls/\" \ + -DAPPLCNAME \ + -DVERSION=\"$(NETATALK_VERSION)\" diff --git a/etc/afpd/nls/Makefile.am b/etc/afpd/nls/Makefile.am index 9ddc4406..30ace1d4 100644 --- a/etc/afpd/nls/Makefile.am +++ b/etc/afpd/nls/Makefile.am @@ -5,4 +5,4 @@ bin_PROGRAMS = makecode parsecode makecode_SOURCES = makecode.c parsecode_SOURCES = parsecode.c -CFLAGS = @CFLAGS@ -I../../../include +CFLAGS = @CFLAGS@ -I../../../include -I../../../sys -I.. diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am index e593f728..76849cb8 100644 --- a/etc/atalkd/Makefile.am +++ b/etc/atalkd/Makefile.am @@ -3,8 +3,10 @@ sbin_PROGRAMS = atalkd atalkd_SOURCES = aep.c config.c main.c multicast.c nbp.c route.c rtmp.c zip.c -atalkd_LDADD = ../../libatalk/libatalk.a +atalkd_LDADD = -L../../libatalk -latalk noinst_HEADERS = atserv.h gate.h interface.h list.h multicast.h nbp.h rtmp.h zip.h -CFLAGS = @CFLAGS@ -I../../include +CFLAGS = @CFLAGS@ -I../../include -I../../sys \ + -D_PATH_ATALKDCONF=\"$(CONFIG_DIR)/atalkd.conf\" \ + -DVERSION=\"$(NETATALK_VERSION)\" diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am index 166df1f1..4a71ab8d 100644 --- a/etc/papd/Makefile.am +++ b/etc/papd/Makefile.am @@ -3,8 +3,11 @@ sbin_PROGRAMS = papd papd_SOURCES = main.c printcap.c session.c file.c comment.c lp.c ppd.c magics.c headers.c queries.c auth.c uam.c -papd_LDADD = ../../libatalk/libatalk.a +papd_LDADD = ../../libatalk/libatalk.a -latalk noinst_HEADERS = comment.h file.h ppd.h printer.h uam_auth.h -CFLAGS = @CFLAGS@ -I../../include +CFLAGS = @CFLAGS@ -I../../include -I../../sys \ + -D_PATH_PAPDCONF=\"$(CONFIG_DIR)/papd.conf\" \ + -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\" \ + -DVERSION=\"$(NETATALK_VERSION)\" diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am index fe3e1391..99c0b022 100644 --- a/etc/psf/Makefile.am +++ b/etc/psf/Makefile.am @@ -5,9 +5,14 @@ sbin_PROGRAMS = psf psa psf_SOURCES = psf.c psa_SOURCES = psa.c -CFLAGS = @CFLAGS@ -I../../include +CFLAGS = @CFLAGS@ -I../../include -I../../sys \ + -DZEROWIDTH \ + -D_PATH_PAP=\"$(bindir)/pap\" \ + -D_PATH_PSORDER=\"$(bindir)/psorder\" \ + -D_PATH_PSA=\"$(sbindir)/psa\" \ + -D_PATH_PSFILTER=\"$(bindir)/etc2ps.sh\" \ + -D_PATH_PAGECOUNT=\"$(CONFIG_DIR)/pagecount.ps\" \ + -DVERSION=\"$(NETATALK_VERSION)\" # how to do symbolic links to psf??? # LINKS = ofpap ifpap tfpap ifpaprev tfpaprev ofwpap ifwpap tfwpap ifwpaprev tfwpaprev ofmpap ifmpap tfmpap ifmpaprev tfmpaprev ofwmpap ifwmpap tfwmpap ifwmpaprev tfwmpaprev - -# also need to pass the psf compilation defines here diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am index 153f7888..7fbdc2db 100644 --- a/etc/uams/Makefile.am +++ b/etc/uams/Makefile.am @@ -2,13 +2,14 @@ #SUBDIRS = uams_krb4 -uams_LTLIBRARIES = uams_dhx_pam.la uams_dhx.passwd.la uams_guest.la uams_pam.la uams_pgp.la uams_randnum.la +uamsdir = $(UAMS_PATH) +uams_LTLIBRARIES = lib_uams_dhx_pam.la lib_uams_dhx.passwd.la lib_uams_guest.la lib_uams_pam.la lib_uams_pgp.la lib_uams_randnum.la -uams_dhx_pam_la_SOURCES = uams_dhx_pam.c -uams_dhx_passwd_la_SOURCES = uams_dhx_passwd.c -uams_guest_la_SOURCES = uams_guest.c -uams_pam_la_SOURCES = uams_pam.c -uams_pgp_la_SOURCES = uams_pgp.c -uams_randnum_la_SOURCES = uams_randnum.c +lib_uams_dhx_pam_la_SOURCES = uams_dhx_pam.c +lib_uams_dhx_passwd_la_SOURCES = uams_dhx_passwd.c +lib_uams_guest_la_SOURCES = uams_guest.c +lib_uams_pam_la_SOURCES = uams_pam.c +lib_uams_pgp_la_SOURCES = uams_pgp.c +lib_uams_randnum_la_SOURCES = uams_randnum.c -CFLAGS = @CFLAGS@ -I../../include +CFLAGS = @CFLAGS@ -I../../include -I../../sys diff --git a/libatalk/adouble/Makefile.am b/libatalk/adouble/Makefile.am index c9010eb8..d92ae7c0 100644 --- a/libatalk/adouble/Makefile.am +++ b/libatalk/adouble/Makefile.am @@ -1,8 +1,8 @@ # Makefile.am for libatalk/adouble/ -noinst_LIBRARIES = libadouble.a +noinst_LTLIBRARIES = libadouble.la -libadouble_a_SOURCES = ad_open.c ad_flush.c ad_read.c ad_write.c ad_size.c ad_mmap.c ad_lock.c ad_date.c ad_attr.c ad_sendfile.c +libadouble_la_SOURCES = ad_open.c ad_flush.c ad_read.c ad_write.c ad_size.c ad_mmap.c ad_lock.c ad_date.c ad_attr.c ad_sendfile.c noinst_HEADERS = ad_private.h -- 2.39.2