-($Id: ChangeLog,v 1.47 2001-06-13 17:41:44 samnoble Exp $)
+($Id: ChangeLog,v 1.48 2001-06-18 13:50:06 rufustfirefly Exp $)
+
+2001-06-18 jeff b <jeff@univrel.pr.uconn.edu>
+ * configure.in, etc/uams/Makefile.am,
+ etc/uams/uams_krb4/Makefile.am: patch #433952 from Sebastian
+ Rittau to move UAM authentication to use libtool
+
+ * configure.in, bin/afppasswd/Makefile.am, config/Makefile.am,
+ contrib/shell_utils/Makefile.am, distrib/initscripts/Makefile.am,
+ etc/afpd/Makefile.am, etc/afpd/nls/Makefile.am,
+ etc/atalkd/Makefile.am, etc/papd/Makefile.am,
+ man/man5/Makefile.am, man/man8/Makefile.am: patch #433906
+ to move to pkgconfdir for package config files (Sebastian Rittau)
+
+ * configure.in: fixed error that caused --with-did not to function
+ properly
2001-06-13 Sam Noble <ns@shadow.org>
* etc/papd/{printcap,ppd,lp,file,comment}.h:
afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la
CFLAGS = @CFLAGS@ \
- -D_PATH_AFPDPWFILE=\"$(sysconfdir)/afppasswd\"
+ -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
CLEANFILES += $(GENFILES)
-sysconf_DATA = $(CONFFILES) $(GENFILES)
+pkgconfdir = #$(pkgconfdir)/ # shut-up automake
+pkgconf_DATA = $(CONFFILES) $(GENFILES)
#
# rule to parse template files
.tmpl:
sed -e s@:UAMS_PATH:@${UAMS_PATH}@ \
- -e s@:NLS_PATH:@${sysconfdir}/nls@ \
- -e s@:ETCDIR:@${sysconfdir}@ \
+ -e s@:NLS_PATH:@${pkgconfdir}/nls@ \
+ -e s@:ETCDIR:@${pkgconfdir}@ \
<$^ >$@
#
-dnl $Id: configure.in,v 1.85 2001-06-11 20:36:10 rufustfirefly Exp $
+dnl $Id: configure.in,v 1.86 2001-06-18 13:50:06 rufustfirefly Exp $
dnl configure.in for netatalk
AC_INIT(bin/adv1tov2/adv1tov2.c)
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
dnl *********************************************************************
)
AC_ARG_WITH(config-dir,
- [ --with-config-dir=path path to config files [default=$ac_prefix_default/etc]],
+ [ --with-config-dir=DIR obsolete - use --pkgconfdir],
sysconfdir="$withval",
- sysconfdir="${prefix}/etc/netatalk"
+ sysconfdir="${prefix}/etc"
+)
+
+AC_ARG_WITH(pkgconfdir,
+ [ --with-pkgconfdir=DIR package specific configuration in DIR [default=SYSCONF/netatalk]],
+ pkgconfdir="$withval",
+ pkgconfdir="${sysconfdir}/netatalk"
)
AC_ARG_WITH(cracklib,
fi
)
-AC_ARG_ENABLE(did,
+AC_ARG_WITH(did,
[ --with-did=[scheme] set DID scheme (last,mtab)],
if test "x$withval" != "xno" ; then
if test "$withval" = "lastdid"; then
)
AC_ARG_WITH(uams-path,
- [ --with-uams-path=path path to UAMs [default=$ac_prefix_default/etc/uams]],
+ [ --with-uams-path=path path to UAMs [default=PKGCONF/uams]],
uams_path="$withval",
- uams_path="${sysconfdir}/uams"
+ uams_path="${pkgconfdir}/uams"
)
dnl --------------------------------------------------------------------------
[ --enable-fhs use Filesystem Hierarchy Standard (FHS) compatibility],
if test "$enableval" = "yes"; then
uams_path="/usr/lib/netatalk"
- sysconfdir="/etc/netatalk"
+ sysconfdir="/etc"
+ pkgconfdir=${sysconfdir}/netatalk
use_pam_so=yes
dnl FIXME: NEED TO HAVE --mandir=/usr/share/man AT SOME POINT...
AC_DEFINE(FHS_COMPATIBILITY)
***** UAMS_PATH
AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}",
- [path to UAMs [default=$ac_prefix_default/etc/uams]])
+ [path to UAMs [default=PKGCONF/uams]])
UAMS_PATH="${uams_path}"
AC_SUBST(UAMS_PATH)
.tmpl:
sed -e s@:BINDIR:@${bindir}@ \
-e s@:SBINDIR:@${sbindir}@ \
- -e s@:ETCDIR:@${sysconfdir}@ \
+ -e s@:ETCDIR:@${pkgconfdir}@ \
<$^ >$@
CLEANFILES = lp2pap.sh
.tmpl:
sed -e s@:BINDIR:@${bindir}@ \
-e s@:SBINDIR:@${sbindir}@ \
- -e s@:ETCDIR:@${sysconfdir}@ \
+ -e s@:ETCDIR:@${pkgconfdir}@ \
<$^ >$@
CLEANFILES = rc.atalk.redhat rc.atalk.suse rc.atalk.tru64 atalk
LIBS = @LIBS@ @AFPD_LIBS@
-CFLAGS = @CFLAGS@ \
- -D_PATH_AFPDDEFVOL=\"$(sysconfdir)/AppleVolumes.default\" \
- -D_PATH_AFPDSYSVOL=\"$(sysconfdir)/AppleVolumes.system\" \
- -D_PATH_AFPDPWFILE=\"$(sysconfdir)/afppasswd\" \
- -D_PATH_AFPDCONF=\"$(sysconfdir)/afpd.conf\" \
+CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+ @CFLAGS@ \
+ -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
+ -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
+ -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
+ -D_PATH_AFPDCONF=\"$(pkgconfdir)/afpd.conf\" \
-D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
- -D_PATH_AFPDNLSPATH=\"$(sysconfdir)/nls/\" \
- -DAFPD_MTAB_FILE=\"$(sysconfdir)/afpd.mtab\" \
+ -D_PATH_AFPDNLSPATH=\"$(pkgconfdir)/nls/\" \
+ -DAFPD_MTAB_FILE=\"$(pkgconfdir)/afpd.mtab\" \
-DAPPLCNAME
# Makefile.am for etc/afpd/nls/
+nlsdir = $(pkgconfdir)/nls
+
bin_PROGRAMS = makecode parsecode
makecode_SOURCES = makecode.c
parsecode_SOURCES = parsecode.c
-CFLAGS = @CFLAGS@ -I$(top_builddir)/include -I$(top_builddir)/sys -I..
+CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys -I$(top_srcdir)/etc/afpd \
+ @CFLAGS@
#
# install/install-strip:
install-data-local: makecode
./makecode; \
- mkdir -p $(DESTDIR)$(sysconfdir)/nls; \
- $(INSTALL_DATA) maccode.* $(DESTDIR)$(sysconfdir)/nls/
+ mkdir -p $(DESTDIR)$(nlsdir); \
+ $(INSTALL_DATA) maccode.* $(DESTDIR)$(nlsdir)
#
# cleanup
noinst_HEADERS = atserv.h gate.h interface.h list.h multicast.h nbp.h rtmp.h zip.h
-CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(sysconfdir)/atalkd.conf\"
+CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"
noinst_HEADERS = comment.h file.h ppd.h printer.h uam_auth.h
-CFLAGS = @CFLAGS@ \
- -D_PATH_PAPDCONF=\"$(sysconfdir)/papd.conf\" \
+CFLAGS = \
+ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+ @CFLAGS@ \
+ -D_PATH_PAPDCONF=\"$(pkgconfdir)/papd.conf\" \
-D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\"
SUBDIRS = uams_krb4
+#
+# conditionally build some modules
+#
+
+UAMS_GENERIC = uams_guest.la uams_randnum.la uams_passwd.la
+
if USE_DHX
-DHX_UAMS_BASE = uams_dhx_passwd.so
-DHX_LINKS = uams_dhx.so
-if USE_PGP
-DHX_UAMS = $(DHX_UAMS_BASE) uams_pgp.so
-else
-DHX_UAMS = $(DHX_UAMS_BASE)
+UAMS_DHX_PW = uams_dhx_passwd.la
endif
+
+if USE_PGP
+UAMS_PGP = uams_pgp.la
endif
if BUILD_PAM
-PAM_UAMS= uams_pam.so
+UAMS_PAM = uams_pam.la
if USE_DHX
-DHX_PAM_UAMS = uams_dhx_pam.so
+UAMS_DHX_PAM = uams_dhx_pam.la
endif
endif
+# links
if USE_PAM_SO
-UAM_CLRTXT_SO=uams_pam.so
-UAM_DHX_SO=uams_dhx_pam.so
+UAMS_CLRTXT_LINK = uams_pam.so
+UAMS_DHX_LINK = uams_dhx_pam.so
else
-UAM_CLRTXT_SO=uams_passwd.so
-UAM_DHX_SO=uams_dhx_passwd.so
+UAMS_CLRTXT_LINK = uams_passwd.so
+UAMS_DHX_LINK = uams_dhx_passwd.so
endif
-uamsdir = @UAMS_PATH@
-uams_DATA = $(DHX_UAMS) $(DHX_PAM_UAMS) $(PAM_UAMS) uams_guest.so \
- uams_passwd.so \
- uams_randnum.so
-
-uams_LINKS = $(DHX_LINKS) uams_clrtxt.so
-
-EXTRA_DIST = uams_dhx_pam.c uams_dhx_passwd.c uams_pgp.c \
- uams_guest.c uams_pam.c uams_passwd.c uams_randnum.c
-
#
-# standard library compilation:
+# source files
#
-SUFFIXES = .c .so
-.c.so:
- $(COMPILE) -DHAVE_CONFIG_H -fPIC -DPIC \
- -I$(top_srcdir) -fomit-frame-pointer -c $< ; \
- $(LD) -shared $(LDSHAREDFLAGS) -o $@ $*.o $(LIBS)
+uams_guest_la_SOURCES = uams_guest.c
+uams_randnum_la_SOURCES = uams_randnum.c
+uams_passwd_la_SOURCES = uams_passwd.c
+uams_pam_la_SOURCES = uams_pam.c
+uams_pgp_la_SOURCES = uams_pgp.c
+uams_dhx_passwd_la_SOURCES = uams_dhx_passwd.c
+uams_dhx_pam_la_SOURCES = uams_dhx_pam.c
#
-# create symbolic links:
+# flags
#
-uams_clrtxt.so:
- $(LN_S) -f $(UAM_CLRTXT_SO) $(DESTDIR)$(UAMS_PATH)/uams_clrtxt.so
-
-uams_dhx.so:
- $(LN_S) -f $(UAM_DHX_SO) $(DESTDIR)$(UAMS_PATH)/uams_dhx.so
+uams_guest_la_LDFLAGS = -module -avoid-version
+uams_randnum_la_LDFLAGS = -module -avoid-version
+uams_passwd_la_LDFLAGS = -module -avoid-version
+uams_pam_la_LDFLAGS = -module -avoid-version
+uams_pgp_la_LDFLAGS = -module -avoid-version
+uams_dhx_passwd_la_LDFLAGS = -module -avoid-version
+uams_dhx_pam_la_LDFLAGS = -module -avoid-version
#
-# install/install-strip:
+# module compilation
#
-install-data-local: $(uams_LINKS)
-
-install-strip:
- strip $(uams_DATA); \
- $(MAKE) $(AM_MAKEFLAGS) install
+uamsdir = @UAMS_PATH@
+uams_LTLIBRARIES = \
+ $(UAMS_GENERIC) \
+ $(UAMS_PGP) \
+ $(UAMS_PAM) \
+ $(UAMS_DHX_PAM) \
+ $(UAMS_DHX_PW)
#
-# cleanup
+# link creation
#
-CLEANFILES += *.o $(uams_DATA)
+uams_LINKS =
+
+if USE_DHX
+install-exec-hook:
+ (cd $(DESTDIR)$(uamsdir) && \
+ rm -f uams_clrtxt.so uams_dhx.so && \
+ $(LN_S) $(UAMS_CLRTXT_LINK) uams_clrtxt.so && \
+ $(LN_S) $(UAMS_DHX_LINK) uams_dhx.so \
+ )
+else
+install-exec-hook:
+ (cd $(DESTDIR)$(uamsdir) && \
+ rm -f uams_clrtxt.so \
+ $(LN_S) $(UAMS_CLRTXT_LINK) uams_clrtxt.so \
+ )
+endif
# Makefile.am for etc/uams/uams_krb4/
if USE_KERBEROS
-
-uamsdir = @UAMS_PATH@
-uams_DATA = uams_krb4.so
-
-endif
-
-EXTRA_DIST = kuam.c lifetime.c send_to_kdc.c uams_krb4.c
-
-#
-# standard library compilation:
-#
-
-SUFFIXES = .c .o
-
-if USE_KERBEROS
-
-.c.o:
- $(COMPILE) -DHAVE_CONFIG_H -fPIC -DPIC \
- -I$(top_srcdir) -fomit-frame-pointer -c $<
-
-uams_krb4.so: kuam.o lifetime.o sent_to_kdc.o uams_krb4.o
- $(LD) $(LDSHAREDFLAGS) -o $@ *.o $(LIBS)
-
-#
-# install/install-strip:
-#
-
-install-strip:
- strip $(uams_DATA); \
- $(MAKE) $(AM_MAKEFLAGS) install
-
+KERBEROS_MODULE = uams_krb4.la
+else
+KERBEROS_MODULE =
endif
-#
-# cleanup
-#
-
-clean distclean clean-recursive distclean-recursive:
- $(RM) $(uams_DATA) *.o core
+uams_krb4_la_SOURCES = kuam.c lifetime.c send_to_kdc.c uams_krb4.c
+uams_krb4_la_LDFLAGS = -module -avoid-version
+uamsdir = @UAMS_PATH@
+uams_LTLIBRARIES = $(KERBEROS_MODULE)
.tmpl:
sed -e s@:SBINDIR:@${sbindir}@ \
-e s@:BINDIR:@${bindir}@ \
- -e s@:ETCDIR:@${sysconfdir}@ \
+ -e s@:ETCDIR:@${pkgconfdir}@ \
-e s@:LIBDIR:@${libdir}@ \
<$^ >$@
.tmpl:
sed -e s@:SBINDIR:@${sbindir}@ \
-e s@:BINDIR:@${bindir}@ \
- -e s@:ETCDIR:@${sysconfdir}@ \
+ -e s@:ETCDIR:@${pkgconfdir}@ \
-e s@:LIBDIR:@${libdir}@ \
<$^ >$@
projects / netatalk.git / commitdiff