Turn off aclocal generation + add file flags

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7813 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index e68cc97c3921e3319998dfdfd6b76fe1aa870fba..00a038d044fd6066c014b24c1d4d1c405febc903 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -58,8 +58,13 @@ bacula-fd: Makefile
        done
 
 #-------------------------------------------------------------------------
+
 autoconf/aclocal.m4: autoconf/configure.in autoconf/bacula-macros/* autoconf/gettext-macros/* autoconf/libtool/*
-       cd autoconf && aclocal -I bacula-macros -I gettext-macros -I libtool
+
+#  Note, the following is needed in the above if ever any new macro is added.
+#   However, at the current time, the -I libtool causes the autoconf/aclocal.m4
+#   get messed up, so this is commented out
+#      cd autoconf && aclocal -I bacula-macros -I gettext-macros -I libtool
 
 configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
        cd $(srcdir);

diff --git a/bacula/autoconf/aclocal.m4.save b/bacula/autoconf/aclocal.m4.save
new file mode 100644 (file)
index 0000000..8188873
--- /dev/null
+++ b/bacula/autoconf/aclocal.m4.save
@@ -0,0 +1,50 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_include([libtool/libtool.m4])
+m4_include([libtool/ltoptions.m4])
+m4_include([libtool/ltsugar.m4])
+m4_include([libtool/ltversion.m4])
+m4_include([libtool/lt~obsolete.m4])
+m4_include([gettext-macros/codeset.m4])
+m4_include([gettext-macros/gettext.m4])
+m4_include([gettext-macros/glibc2.m4])
+m4_include([gettext-macros/glibc21.m4])
+m4_include([gettext-macros/iconv.m4])
+m4_include([gettext-macros/intdiv0.m4])
+m4_include([gettext-macros/intmax.m4])
+m4_include([gettext-macros/inttypes-pri.m4])
+m4_include([gettext-macros/inttypes.m4])
+m4_include([gettext-macros/inttypes_h.m4])
+m4_include([gettext-macros/isc-posix.m4])
+m4_include([gettext-macros/lcmessage.m4])
+m4_include([gettext-macros/lib-ld.m4])
+m4_include([gettext-macros/lib-link.m4])
+m4_include([gettext-macros/lib-prefix.m4])
+m4_include([gettext-macros/longdouble.m4])
+m4_include([gettext-macros/longlong.m4])
+m4_include([gettext-macros/nls.m4])
+m4_include([gettext-macros/po.m4])
+m4_include([gettext-macros/printf-posix.m4])
+m4_include([gettext-macros/progtest.m4])
+m4_include([gettext-macros/signed.m4])
+m4_include([gettext-macros/size_max.m4])
+m4_include([gettext-macros/stdint_h.m4])
+m4_include([gettext-macros/uintmax_t.m4])
+m4_include([gettext-macros/ulonglong.m4])
+m4_include([gettext-macros/wchar_t.m4])
+m4_include([gettext-macros/wint_t.m4])
+m4_include([gettext-macros/xsize.m4])
+m4_include([bacula-macros/db.m4])
+m4_include([bacula-macros/largefiles.m4])
+m4_include([bacula-macros/os.m4])