More automake/autoconf updates (megatron is disabled, but netatalk builds)

diff --git a/acconfig.h b/acconfig.h
index 1399aafaf6c8bdc534f334537a80d18ac0fce132..be97eaf0a62a56b01028b0bf60099be2cba51cb4 100644 (file)
--- 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 6408da2cb1ae5714b6b7b86276e50504ae3465e2..cec7ec6cba66532cd08d71e5a060e9789c7686a1 100755 (executable)
--- 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 489a420206dcf0b767967383316bc74ad606340d..d6b2b37169e49e96fb7cd29b860530aa3281c9e1 100644 (file)
--- 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 b7a9f3d0cf13f463e8aa67dc78a1504b309996ef..dc8f9d69a9346dcae49d7dba10061ea0ca81bc95 100644 (file)
--- 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 9ddc44062b88c504660360e2210d69d36b1832f4..30ace1d4a869fe2fd14e7ed018165ffd688be03e 100644 (file)
--- 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 e593f72853e112beee90b26cd03c07ad4e066574..76849cb818a1b45789238ae5eeb76263cd6b2680 100644 (file)
--- 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 166df1f1af396fcfbf0964fa91e3d88311ed0833..4a71ab8db2f58dc70665c1ec6e175b973d2ae545 100644 (file)
--- 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 fe3e1391338fd84cc088f619d8b46d1af22243fb..99c0b0221e1afdd70856071b78eaac43b822370a 100644 (file)
--- 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 153f78889bf88f884a55472b550d9b13d8213bb7..7fbdc2dbba82b9d97bd4bd154855998326b3de3d 100644 (file)
--- 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 c9010eb8cbb2583ba97df572f2fb0ad65af4ec4f..d92ae7c074b7bf2b945fcced0fe0362ac02c0ae9 100644 (file)
--- 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