* rename "aux/" subdir into "m4/" so as to avoid problems with

MS-DOS systems (where "AUX" is a reserved name).  This required
fixing numerous files.

diff --git a/ChangeLog b/ChangeLog
index 51ca6bc7d22bf13ad79c2c9d85b4ade8b6d6b498..7334a08ef52805b3a1b1d4282db00b2675f17998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-10  Erez Zadok  <ezk@localhost.localdomain>
+
+       * rename "aux/" subdir into "m4/" so as to avoid problems with
+       MS-DOS systems (where "AUX" is a reserved name).  This required
+       fixing numerous files.
+
 2002-11-21  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * config.guess.long: updated script so it will properly find the

diff --git a/Makefile.am b/Makefile.am
index 4d78a250249d7a202887f5667913f644ed3fb856..32f8e435f17307089f551c6459e3677c923d1bd2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,113 +24,113 @@ SUBDIRS =         \
 #SUBDIRS = lib wire-test amq amd
 
 # additional files to add to the distribution tar file
-#      aux/aclocal
-EXTRA_DIST_AUX =                       \
-       aux/GNUmakefile                 \
-       aux/amdgrep                     \
-       aux/amindent                    \
-       aux/autopat                     \
-       aux/chop-aclocal.pl             \
-       aux/copy-if-newbig              \
-       aux/mk-aclocal                  \
-       aux/mkconf                      \
-       aux/rmtspc                      \
-       aux/update_build_version        \
+#      m4/aclocal
+EXTRA_DIST_M4 =                        \
+       m4/GNUmakefile                  \
+       m4/amdgrep                      \
+       m4/amindent                     \
+       m4/autopat                      \
+       m4/chop-aclocal.pl              \
+       m4/copy-if-newbig               \
+       m4/mk-aclocal                   \
+       m4/mkconf                       \
+       m4/rmtspc                       \
+       m4/update_build_version         \
        \
-       aux/macros/HEADER                               \
-       aux/macros/TRAILER                              \
-       aux/macros/c_void_p.m4                          \
-       aux/macros/cache_check_dynamic.m4               \
-       aux/macros/check_amu_fs.m4                      \
-       aux/macros/check_checkmount_style.m4            \
-       aux/macros/check_extern.m4                      \
-       aux/macros/check_fhandle.m4                     \
-       aux/macros/check_field.m4                       \
-       aux/macros/check_fs_headers.m4                  \
-       aux/macros/check_fs_mntent.m4                   \
-       aux/macros/check_gnu_getopt.m4                  \
-       aux/macros/check_hide_mount_type.m4             \
-       aux/macros/check_lib2.m4                        \
-       aux/macros/check_map_funcs.m4                   \
-       aux/macros/check_mnt2_cdfs_opt.m4               \
-       aux/macros/check_mnt2_gen_opt.m4                \
-       aux/macros/check_mnt2_nfs_opt.m4                \
-       aux/macros/check_mnttab_file_name.m4            \
-       aux/macros/check_mnttab_location.m4             \
-       aux/macros/check_mnttab_opt.m4                  \
-       aux/macros/check_mnttab_style.m4                \
-       aux/macros/check_mnttab_type.m4                 \
-       aux/macros/check_mount_style.m4                 \
-       aux/macros/check_mount_trap.m4                  \
-       aux/macros/check_mount_type.m4                  \
-       aux/macros/check_mtype_printf_type.m4           \
-       aux/macros/check_mtype_type.m4                  \
-       aux/macros/check_network_transport_type.m4      \
-       aux/macros/check_nfs_fh_dref.m4                 \
-       aux/macros/check_nfs_hn_dref.m4                 \
-       aux/macros/check_nfs_prot_headers.m4            \
-       aux/macros/check_nfs_sa_dref.m4                 \
-       aux/macros/check_nfs_socket_connection.m4       \
-       aux/macros/check_os_libs.m4                     \
-       aux/macros/check_restartable_signal_handler.m4  \
-       aux/macros/check_umount_style.m4                \
-       aux/macros/check_unmount_args.m4                \
-       aux/macros/check_unmount_call.m4                \
-       aux/macros/expand_cpp_hex.m4                    \
-       aux/macros/expand_cpp_int.m4                    \
-       aux/macros/expand_cpp_string.m4                 \
-       aux/macros/expand_run_string.m4                 \
-       aux/macros/extern_optarg.m4                     \
-       aux/macros/extern_sys_errlist.m4                \
-       aux/macros/field_mntent_t_mnt_time_string.m4    \
-       aux/macros/func_bad_memcmp.m4                   \
-       aux/macros/func_bad_yp_all.m4                   \
-       aux/macros/header_templates.m4                  \
-       aux/macros/host_macros.m4                       \
-       aux/macros/linux_headers.m4                     \
-       aux/macros/localconfig.m4                       \
-       aux/macros/mount_headers.m4                     \
-       aux/macros/name_package.m4                      \
-       aux/macros/name_version.m4                      \
-       aux/macros/opt_amu_cflags.m4                    \
-       aux/macros/opt_cppflags.m4                      \
-       aux/macros/opt_debug.m4                         \
-       aux/macros/opt_ldflags.m4                       \
-       aux/macros/opt_libs.m4                          \
-       aux/macros/os_cflags.m4                         \
-       aux/macros/os_cppflags.m4                       \
-       aux/macros/os_ldflags.m4                        \
-       aux/macros/package_bugreport.m4                 \
-       aux/macros/package_name.m4                      \
-       aux/macros/package_version.m4                   \
-       aux/macros/save_state.m4                        \
-       aux/macros/struct_field_nfs_fh.m4               \
-       aux/macros/struct_mntent.m4                     \
-       aux/macros/struct_mnttab.m4                     \
-       aux/macros/struct_nfs_args.m4                   \
-       aux/macros/struct_nfs_fh.m4                     \
-       aux/macros/struct_nfs_fh3.m4                    \
-       aux/macros/struct_nfs_gfs_mount.m4              \
-       aux/macros/try_compile_anyfs.m4                 \
-       aux/macros/try_compile_nfs.m4                   \
-       aux/macros/try_compile_rpc.m4                   \
-       aux/macros/type_auth_create_gidlist.m4          \
-       aux/macros/type_cachefs_args.m4                 \
-       aux/macros/type_cdfs_args.m4                    \
-       aux/macros/type_efs_args.m4                     \
-       aux/macros/type_lofs_args.m4                    \
-       aux/macros/type_mfs_args.m4                     \
-       aux/macros/type_pcfs_args.m4                    \
-       aux/macros/type_recvfrom_fromlen.m4             \
-       aux/macros/type_rfs_args.m4                     \
-       aux/macros/type_svc_in_arg.m4                   \
-       aux/macros/type_time_t.m4                       \
-       aux/macros/type_tmpfs_args.m4                   \
-       aux/macros/type_ufs_args.m4                     \
-       aux/macros/type_xdrproc_t.m4                    \
-       aux/macros/type_xfs_args.m4                     \
-       aux/macros/type_yp_order_outorder.m4            \
-       aux/macros/with_addon.m4
+       m4/macros/HEADER                                \
+       m4/macros/TRAILER                               \
+       m4/macros/c_void_p.m4                           \
+       m4/macros/cache_check_dynamic.m4                \
+       m4/macros/check_amu_fs.m4                       \
+       m4/macros/check_checkmount_style.m4             \
+       m4/macros/check_extern.m4                       \
+       m4/macros/check_fhandle.m4                      \
+       m4/macros/check_field.m4                        \
+       m4/macros/check_fs_headers.m4                   \
+       m4/macros/check_fs_mntent.m4                    \
+       m4/macros/check_gnu_getopt.m4                   \
+       m4/macros/check_hide_mount_type.m4              \
+       m4/macros/check_lib2.m4                         \
+       m4/macros/check_map_funcs.m4                    \
+       m4/macros/check_mnt2_cdfs_opt.m4                \
+       m4/macros/check_mnt2_gen_opt.m4                 \
+       m4/macros/check_mnt2_nfs_opt.m4                 \
+       m4/macros/check_mnttab_file_name.m4             \
+       m4/macros/check_mnttab_location.m4              \
+       m4/macros/check_mnttab_opt.m4                   \
+       m4/macros/check_mnttab_style.m4                 \
+       m4/macros/check_mnttab_type.m4                  \
+       m4/macros/check_mount_style.m4                  \
+       m4/macros/check_mount_trap.m4                   \
+       m4/macros/check_mount_type.m4                   \
+       m4/macros/check_mtype_printf_type.m4            \
+       m4/macros/check_mtype_type.m4                   \
+       m4/macros/check_network_transport_type.m4       \
+       m4/macros/check_nfs_fh_dref.m4                  \
+       m4/macros/check_nfs_hn_dref.m4                  \
+       m4/macros/check_nfs_prot_headers.m4             \
+       m4/macros/check_nfs_sa_dref.m4                  \
+       m4/macros/check_nfs_socket_connection.m4        \
+       m4/macros/check_os_libs.m4                      \
+       m4/macros/check_restartable_signal_handler.m4   \
+       m4/macros/check_umount_style.m4                 \
+       m4/macros/check_unmount_args.m4                 \
+       m4/macros/check_unmount_call.m4                 \
+       m4/macros/expand_cpp_hex.m4                     \
+       m4/macros/expand_cpp_int.m4                     \
+       m4/macros/expand_cpp_string.m4                  \
+       m4/macros/expand_run_string.m4                  \
+       m4/macros/extern_optarg.m4                      \
+       m4/macros/extern_sys_errlist.m4                 \
+       m4/macros/field_mntent_t_mnt_time_string.m4     \
+       m4/macros/func_bad_memcmp.m4                    \
+       m4/macros/func_bad_yp_all.m4                    \
+       m4/macros/header_templates.m4                   \
+       m4/macros/host_macros.m4                        \
+       m4/macros/linux_headers.m4                      \
+       m4/macros/localconfig.m4                        \
+       m4/macros/mount_headers.m4                      \
+       m4/macros/name_package.m4                       \
+       m4/macros/name_version.m4                       \
+       m4/macros/opt_amu_cflags.m4                     \
+       m4/macros/opt_cppflags.m4                       \
+       m4/macros/opt_debug.m4                          \
+       m4/macros/opt_ldflags.m4                        \
+       m4/macros/opt_libs.m4                           \
+       m4/macros/os_cflags.m4                          \
+       m4/macros/os_cppflags.m4                        \
+       m4/macros/os_ldflags.m4                         \
+       m4/macros/package_bugreport.m4                  \
+       m4/macros/package_name.m4                       \
+       m4/macros/package_version.m4                    \
+       m4/macros/save_state.m4                         \
+       m4/macros/struct_field_nfs_fh.m4                \
+       m4/macros/struct_mntent.m4                      \
+       m4/macros/struct_mnttab.m4                      \
+       m4/macros/struct_nfs_args.m4                    \
+       m4/macros/struct_nfs_fh.m4                      \
+       m4/macros/struct_nfs_fh3.m4                     \
+       m4/macros/struct_nfs_gfs_mount.m4               \
+       m4/macros/try_compile_anyfs.m4                  \
+       m4/macros/try_compile_nfs.m4                    \
+       m4/macros/try_compile_rpc.m4                    \
+       m4/macros/type_auth_create_gidlist.m4           \
+       m4/macros/type_cachefs_args.m4                  \
+       m4/macros/type_cdfs_args.m4                     \
+       m4/macros/type_efs_args.m4                      \
+       m4/macros/type_lofs_args.m4                     \
+       m4/macros/type_mfs_args.m4                      \
+       m4/macros/type_pcfs_args.m4                     \
+       m4/macros/type_recvfrom_fromlen.m4              \
+       m4/macros/type_rfs_args.m4                      \
+       m4/macros/type_svc_in_arg.m4                    \
+       m4/macros/type_time_t.m4                        \
+       m4/macros/type_tmpfs_args.m4                    \
+       m4/macros/type_ufs_args.m4                      \
+       m4/macros/type_xdrproc_t.m4                     \
+       m4/macros/type_xfs_args.m4                      \
+       m4/macros/type_yp_order_outorder.m4             \
+       m4/macros/with_addon.m4
 
 EXTRA_DIST_CONF =                      \
        conf/checkmount/checkmount_aix.c        \
@@ -259,7 +259,7 @@ EXTRA_DIST_INCLUDE =                \
        include/mount_headers2.h
 
 EXTRA_DIST =                   \
-       $(EXTRA_DIST_AUX)       \
+       $(EXTRA_DIST_M4)        \
        $(EXTRA_DIST_CONF)      \
        $(EXTRA_DIST_INCLUDE)   \
        \
@@ -285,7 +285,7 @@ DISTCLEANFILES = amu_nfs_prot.h config.cache.old dbgcf.h
 
 # update possibly new versions of autoconf/automake/libtool files
 update:
-       (cd $(top_srcdir) && ${MAKE} ${MFLAGS} -f ./aux/GNUmakefile update)
+       (cd $(top_srcdir) && ${MAKE} ${MFLAGS} -f ./m4/GNUmakefile update)
        ${MAKE} ${MFLAGS} libtool
 
 # remake libtool

diff --git a/README b/README
index 2d88b3d6ba85fa8c5766dea6332ac83856b899c3..c7b618fe806abea96af4f2c5ea3cee48707216c7 100644 (file)
--- a/README
+++ b/README
@@ -74,7 +74,7 @@ for example to add hesiod support, do so as follows:
 hlfsd, lib, etc, all you need to do to get a new version of am-utils is run
 make.
 
-If you modify any of the files in the aux/ or conf/ directories, or any *.in
+If you modify any of the files in the m4/ or conf/ directories, or any *.in
 or *.am file, then you must rebuild the configure script, Makefile.in files,
 aclocal.m4, etc.  The best way to do so is to run
 

diff --git a/amd/Makefile.am b/amd/Makefile.am
index 0a607e65290c12036efe5a642e9fcef7fde1d6f7..e7820c65235ad87d834ed7e945f87da78a6da863 100644 (file)
--- a/amd/Makefile.am
+++ b/amd/Makefile.am
@@ -137,4 +137,4 @@ build_version.h: $(amd_SOURCES) $(EXTRA_amd_SOURCES)        \
                $(top_srcdir)/include/amq_defs.h        \
                @AMU_NFS_PROT_HEADER@                   \
                $(noinst_HEADERS)
-       $(top_srcdir)/aux/update_build_version
+       $(top_srcdir)/m4/update_build_version

diff --git a/aux_conf.h.in b/aux_conf.h.in
index 7740d753ac64ce77d02c1cec5c69253615f10d70..dbae5bd22071d77995282840490336e51775991c 100644 (file)
--- a/aux_conf.h.in
+++ b/aux_conf.h.in
@@ -11,7 +11,7 @@
  * The next line is a literal inclusion of a file which includes a
  * definition for the MOUNT_TRAP macro for a particular architecture.
  * If it defines the wrong entry, check the AC_CHECK_MOUNT_TRAP m4 macro
- * in $srcdir/aux/macros.
+ * in $srcdir/m4/macros.
  */
 @am_utils_mount_trap@
 /* End of included MOUNT_TRAP macro definition file */
@@ -21,7 +21,7 @@
  * the UNMOUNT_TRAP macro for a particular architecture.
  * If it defines the wrong entry, check the AC_CHECK_UNMOUNT_CALL m4 macro
  * in $srcdir/aclocal.m4.  If the arguments are being defined wrong, check
- * the macro AC_CHECK_UNMOUNT_ARGS in $srcdir/aux/macros.
+ * the macro AC_CHECK_UNMOUNT_ARGS in $srcdir/m4/macros.
  */
 #define UNMOUNT_TRAP(mnt)      @am_utils_unmount_call@(@am_utils_unmount_args@)
 /* End of replaced UNMOUNT_TRAP macro definition */
@@ -30,7 +30,7 @@
  * The next line is a literal inclusion of a file which includes a
  * definition for the NFS_FH_DREF macro for a particular architecture.
  * If it defines the wrong entry, check the AC_CHECK_NFS_FH_DREF m4 macro
- * in $srcdir/aux/macros.
+ * in $srcdir/m4/macros.
  */
 @am_utils_nfs_fh_dref@
 /* End of included NFS_FH_DREF macro definition file */
@@ -39,7 +39,7 @@
  * The next line is a literal inclusion of a file which includes a
  * definition for the NFS_SA_DREF macro for a particular architecture.
  * If it defines the wrong entry, check the AC_CHECK_NFS_SA_DREF m4 macro
- * in $srcdir/aux/macros.
+ * in $srcdir/m4/macros.
  */
 @am_utils_nfs_sa_dref@
 /* End of included NFS_SA_DREF macro definition file */
@@ -48,7 +48,7 @@
  * The next line is a literal inclusion of a file which includes a
  * definition for the NFS_HN_DREF macro for a particular architecture.
  * If it defines the wrong entry, check the AC_CHECK_NFS_HN_DREF m4 macro
- * in $srcdir/aux/macros.
+ * in $srcdir/m4/macros.
  */
 @am_utils_nfs_hn_dref@
 /* End of included NFS_HN_DREF macro definition file */

diff --git a/bootstrap b/bootstrap
index a9b2b840c390de590b527431b2556c43c75d9c93..58f1df1c338ab7508c41b472afd72f557c79564e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -13,12 +13,12 @@ if [ ! -f amd/amd.c ]; then
 fi
 
 # validate macros directory and some macro files
-if [ ! -d aux/macros ]; then
-    echo No aux/macros directory found!
+if [ ! -d m4/macros ]; then
+    echo No m4/macros directory found!
     exit 1
 fi
-if [ ! -f aux/macros/HEADER ]; then
-    echo No aux/macros/HEADER file found!
+if [ ! -f m4/macros/HEADER ]; then
+    echo No m4/macros/HEADER file found!
     exit 1
 fi
 
@@ -28,7 +28,7 @@ rm -fr autom4te.cache
 # generate acinclude.m4 file
 echo "AMU: prepare acinclude.m4..."
 test -f acinclude.m4 && mv -f acinclude.m4 acinclude.m4.old
-(cd aux/macros
+(cd m4/macros
  for i in HEADER *.m4; do
      cat $i
      echo

diff --git a/buildall b/buildall
index 823aeb2aff5dfe7a0ce4a938f6283bfea53f3690..e71b4f33f9c0d2ebe955be7fb17404c2a30a0c8e 100755 (executable)
--- a/buildall
+++ b/buildall
@@ -175,7 +175,7 @@ case "$1" in
     ;;
 
     -K )
-#      mkcnf_cmd="../aux/mkconf"
+#      mkcnf_cmd="../m4/mkconf"
        mkcnf_cmd="../bootstrap"
        if test -f bootstrap ; then
            :

diff --git a/conf/nfs_prot/nfs_prot_darwin.h b/conf/nfs_prot/nfs_prot_darwin.h
index 1745f96f18a827534eaf5f104894163caacda35f..1223c482b07656f4836852caa39679b9f498078a 100644 (file)
--- a/conf/nfs_prot/nfs_prot_darwin.h
+++ b/conf/nfs_prot/nfs_prot_darwin.h
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: nfs_prot_darwin.h,v 1.1.2.2 2002/01/21 00:49:48 ezk Exp $
+ * $Id: nfs_prot_darwin.h,v 1.1.2.3 2002/12/10 22:31:33 ezk Exp $
  *
  */
 
@@ -236,7 +236,7 @@ typedef writeargs nfswriteargs;
 /*
  * as of 3.0-RELEASE the nfs_fh3 that is defined in the system headers
  * (or the one generated by rpcgen) lacks the proper full definition,
- * listed below.  A special macro (aux/macros/struct_nfs_fh3.m4) searches
+ * listed below.  A special macro (m4/macros/struct_nfs_fh3.m4) searches
  * for this special name before other names.
  */
 

diff --git a/conf/nfs_prot/nfs_prot_freebsd3.h b/conf/nfs_prot/nfs_prot_freebsd3.h
index 5f1eacb6bfcc910b4453da7e9de70be962aa10ee..7956ef795eea09475252e8d70f4f05efbd22f58f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: nfs_prot_freebsd3.h,v 1.5.2.2 2002/01/21 00:49:48 ezk Exp $
+ * $Id: nfs_prot_freebsd3.h,v 1.5.2.3 2002/12/10 22:31:33 ezk Exp $
  *
  */
 
@@ -163,7 +163,7 @@ typedef writeargs nfswriteargs;
 /*
  * as of 3.0-RELEASE the nfs_fh3 that is defined in the system headers
  * (or the one generated by rpcgen) lacks the proper full definition,
- * listed below.  A special macro (aux/macros/struct_nfs_fh3.m4) searches
+ * listed below.  A special macro (m4/macros/struct_nfs_fh3.m4) searches
  * for this special name before other names.
  */
 struct nfs_fh3_freebsd3 {

diff --git a/conf/nfs_prot/nfs_prot_openbsd.h b/conf/nfs_prot/nfs_prot_openbsd.h
index aef0e953c6858d1301516c3284c293874eba7825..ecc117a42dc52737c6599bde3b86c28f6b68fa7d 100644 (file)
--- a/conf/nfs_prot/nfs_prot_openbsd.h
+++ b/conf/nfs_prot/nfs_prot_openbsd.h
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: nfs_prot_openbsd.h,v 1.3.2.2 2002/01/21 00:49:49 ezk Exp $
+ * $Id: nfs_prot_openbsd.h,v 1.3.2.3 2002/12/10 22:31:33 ezk Exp $
  *
  */
 
@@ -153,7 +153,7 @@ typedef writeargs nfswriteargs;
 /*
  * turn of this function so it cannot be used!  OpenBSD seems to
  * require that NFS sockets be connected.
- * See aux/macros/check_nfs_socket_connection.m4.
+ * See m4/macros/check_nfs_socket_connection.m4.
  */
 
 # define MOUNT_NFS3 MOUNT_NFS

diff --git a/configure.in b/configure.in
index d19fa2bbfafa6507f7f92a48048703b4291d1e73..27b1a5e144ba62b9616a18996b84d0f9da1098fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,7 @@ AH_TOP([
 #ifndef _CONFIG_H
 #define _CONFIG_H
 ])
-dnl add actual "#undef" commands into aux/macros/header_templates.m4
+dnl add actual "#undef" commands into m4/macros/header_templates.m4
 AH_BOTTOM([
 /****************************************************************************/
 /*** INCLUDE localconfig.h if it exists, to allow users to make some      ***/
@@ -51,9 +51,9 @@ AH_BOTTOM([
 /* End of am-utils-6.x config.h file */
 ])
 dnl
-dnl AC_CONFIG_AUX_DIR(aux)
+dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.1.2.31 $)
+AC_REVISION($Revision: 1.1.2.32 $)
 AC_COPYRIGHT([Copyright (c) 1997-2002 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)

diff --git a/m4/GNUmakefile b/m4/GNUmakefile
index f3133c2ca7859425345dad355d5f3d32d151fb64..f35fef5dfe97eeef81310841b6752eb251bd2291 100644 (file)
--- a/m4/GNUmakefile
+++ b/m4/GNUmakefile
@@ -6,20 +6,20 @@
 # Erez Zadok <ezk@cs.columbia.edu>
 #
 
-AUTOCONF=autoconf --localdir=./aux ./aux/configure.in
-AUTOHEADER=autoheader --localdir=./aux ./aux/configure.in
-#AUTOMAKE=./aux/automake --include-deps --amdir=./aux/amdir
-#AUTOMAKE=automake --include-deps --no-intermediates --localdir=./aux
-#AUTOMAKE=automake --include-deps --localdir=./aux
-AUTOMAKE=automake --include-deps --altdir=./aux
-ACLOCAL=aclocal --altdir=./aux
+AUTOCONF=autoconf --localdir=./m4 ./m4/configure.in
+AUTOHEADER=autoheader --localdir=./m4 ./m4/configure.in
+#AUTOMAKE=./m4/automake --include-deps --amdir=./m4/amdir
+#AUTOMAKE=automake --include-deps --no-intermediates --localdir=./m4
+#AUTOMAKE=automake --include-deps --localdir=./m4
+AUTOMAKE=automake --include-deps --altdir=./m4
+ACLOCAL=aclocal --altdir=./m4
 MK_ACLOCAL=./mk-aclocal
 
 CUTWARNMSG="warning: AC_TRY_RUN called without default to allow cross compilin"
 CUTWARNMSG2="AC_OUTPUT_COMMANDS|autoupdate"
 AMFILES=../Makefile.am $(wildcard ../*/Makefile.am)
 INAMFILES=$(AMFILES:.am=.in)
-ACFILES=$(wildcard macros/*.m4 macros/HEADER macros/TRAILER aux/aclocal.m4)
+ACFILES=$(wildcard macros/*.m4 macros/HEADER macros/TRAILER m4/aclocal.m4)
 
 LOG=/tmp/amu-${USER}.log
 
@@ -63,7 +63,7 @@ ${TOPDIR}/configure: configure.in aclocal.m4
        chmod a+rx $@
 
 config.h.in: configure.in acconfig.h
-       -(cd ${TOPDIR} && ${AUTOHEADER} > ./aux/config.h.in 2> ${LOG})
+       -(cd ${TOPDIR} && ${AUTOHEADER} > ./m4/config.h.in 2> ${LOG})
        -@egrep -v ${CUTWARNMSG} ${LOG} > ${LOG}.new ; mv ${LOG}.new ${LOG}
        @echo '############################################################'
        @echo 'Checking for "AC_OUTPUT_COMMANDS" warnings:'
@@ -99,7 +99,7 @@ P1=/usr/local/gnu/lib/automake
 P2=/usr/local/gnu/lib/libtool
 P3=/misc/mirror/gnu/prep/config
 P4=/misc/mirror/gnu/prep
-ICMD=./aux/copy-if-newbig
+ICMD=./m4/copy-if-newbig
 CPCMD=cp -p
 
 update:                \

diff --git a/m4/amdgrep b/m4/amdgrep
index e99e444015121d8be6c3015c07a5f8cedcc42151..86dffbf791cf700f4467ec7e1177cf9f4a5ffad2 100755 (executable)
--- a/m4/amdgrep
+++ b/m4/amdgrep
@@ -4,4 +4,4 @@ exec egrep -n "$*" \
     conf/*/*.[hc] \
     Makefile.am \
     [a-z]*/Makefile.am \
-    aux/macros/*.m4
+    m4/macros/*.m4

diff --git a/m4/amindent b/m4/amindent
index 627dc5e4fd00fb0c3e334624c373360dece08ce6..8c4f7fcdf02f362d50c5fae7ea54a11affc57960 100755 (executable)
--- a/m4/amindent
+++ b/m4/amindent
@@ -317,7 +317,7 @@ for i in ${files}; do
     fi
 
     # remove trailing spaces
-    cmd="./aux/rmtspc $i"
+    cmd="./m4/rmtspc $i"
     echo ${cmd}
     ${cmd}
     if [ $? != 0 ]; then

diff --git a/m4/autopat b/m4/autopat
index 5d03a0d6a893c180fb1c17b0056dcdd8379632f0..1b1ed77b6335e685569d7a7ffc1bdc9e5a17e8f1 100755 (executable)
--- a/m4/autopat
+++ b/m4/autopat
@@ -4,7 +4,7 @@
 # Erez Zadok <ezk@cs.columbia.edu>
 #set -x
 
-macdir="../aux/macros"
+macdir="../m4/macros"
 
 # find the right directory
 if [ ! -d $macdir ]; then

diff --git a/m4/macros/HEADER b/m4/macros/HEADER
index e4671a7cf29baa4deae136437275a01cd2e978b5..928095f0a56a48cbb6b4e874c00e556ede0bffb7 100644 (file)
--- a/m4/macros/HEADER
+++ b/m4/macros/HEADER
@@ -3,7 +3,7 @@ dnl Contains definitions for specialized GNU-autoconf macros.
 dnl Author: Erez Zadok <ezk@cs.columbia.edu>
 dnl
 dnl DO NOT EDIT DIRECTLY!  Generated automatically by maintainers from
-dnl aux/Makefile!
+dnl m4/GNUmakefile!
 dnl
 dnl ######################################################################
 dnl UNCOMMENT THE NEXT FEW LINES FOR DEBUGGING CONFIGURE

diff --git a/m4/macros/header_templates.m4 b/m4/macros/header_templates.m4
index 6939141bb093d72c43e7b07ab551af1ac27ed6f3..5783b4b83a79e2da52d9d0adb7779c0b39314ff0 100644 (file)
--- a/m4/macros/header_templates.m4
+++ b/m4/macros/header_templates.m4
@@ -1,4 +1,4 @@
-dnl FILE: aux/macros/header_templates.m4
+dnl FILE: m4/macros/header_templates.m4
 dnl defines descriptions for various am-utils specific macros
 
 AH_TEMPLATE([HAVE_AMU_FS_AUTO],

diff --git a/m4/mkconf b/m4/mkconf
index 1be2edeb7e71427e5a35e9c4735517276230486a..04fc92de2ba88bd98c9b074cb5fdbde77513d132 100755 (executable)
--- a/m4/mkconf
+++ b/m4/mkconf
@@ -17,4 +17,4 @@ if [ ! -f amd/amd.c ]; then
        exit 1
 fi
 
-cd aux && make $*
+cd m4 && make $*