Add configure file protection.

diff --git a/ChangeLog b/ChangeLog
index 11d1b0d22336814380a238185447e8cd68dff015..b8ed17765222a9525facc05ec33aa6c10b61d13f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-28  Lance Levsen  <l.levsen@printwest.com>
+
+       * config/Makefile.am: Added a variable substitution from
+       configure.in to stop overwriting the config files.
+
+       * configure.in: Added --enable-overwrite flag that enables the
+       overwriting of configure files. Default is no overwrite, but does
+       check for missing files.
+       
 2001-08-27  jeff b  <jeff@univrel.pr.uconn.edu>
 
        Released 1.5pre7

diff --git a/config/Makefile.am b/config/Makefile.am
index 651ca16fbbfa777a8420422191232dd5581d9d28..5f156c08f47ce27da7f09d9c0908d91d51c6f78d 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -12,8 +12,8 @@ EXTRA_DIST = $(CONFFILES) $(TMPLFILES) $(PAMFILES)
 
 CLEANFILES += $(GENFILES)
 
+pkgconf_DATA= @OVERWRITE@
 pkgconfdir = @PKGCONFDIR@
-pkgconf_DATA = $(CONFFILES) $(GENFILES)
 
 #
 # rule to parse template files

diff --git a/configure.in b/configure.in
index 91d4159183c878adc259e577799d51e6306cc603..9ad9a47a0d74cc981517c71180ffe6e4772b0fb4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.97 2001-08-21 20:56:43 rufustfirefly Exp $
+dnl $Id: configure.in,v 1.98 2001-08-28 07:13:03 lancel Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -690,17 +690,39 @@ AC_ARG_ENABLE(krb4-uam,
                AC_MSG_RESULT([enabling build with Kerberos v4 UAM module])
        fi
 )
+dnl --------------------- overwrite the config files . . . or not.
+
+files="AppleVolumes.default AppleVolumes.system atalkd.conf netatalk.conf netatalk.pamd papd.conf afpd.conf"
+
+AC_ARG_ENABLE(overwrite,
+       [  --enable-overwrite      Overwrite configuration files
+                                  default=PKGCONFDIR],
+       [ 
+       OVERWRITE="$files"
+       AC_MSG_RESULT([Overwrite configuration files])
+       ],
+       
+       [       
+       for f in $files ; do
+               if test -f "${PKGCONFDIR}/$f" ; 
+               then :;
+               else OVERWRITE="${OVERWRITE} $f";
+               fi
+       done
+       AC_MSG_RESULT([Don't overwrite existing configuration files])
+       ]       
+)
 
 dnl --------------------- last minute substitutions
 
+
 AC_SUBST(LIBS)
 AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
-
 AC_SUBST(CFLAGS)
 AC_SUBST(LDSHAREDFLAGS)
-
 AC_SUBST(PKGCONFDIR)
+AC_SUBST(OVERWRITE)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)