gnulib-tool: testing non-default sourcebase and m4base

[Bruno Haible]

Hi,

I committed this change, to test non-default sourcebase and m4base.
Please let me know if it causes problems.


2006-08-24  Bruno Haible <address@hidden>

        * gnulib-tool (func_create_testdir): Use non-default values of
        sourcebase and m4base.

*** gnulib-20060823/gnulib-tool 2006-08-23 14:04:46.000000000 +0200
--- gnulib-20060823-modified/gnulib-tool        2006-08-24 03:52:14.000000000 
+0200
***************
*** 1722,1727 ****
--- 1722,1732 ----
    modules="$2"
    modules=`for m in $modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C 
uniq`
  
+   # Subdirectory names.
+   sourcebase=gllib
+   m4base=glm4
+   testsbase=gltests
+ 
    # Determine final module list.
    func_modules_transitive_closure
    echo "Module list with included dependencies:"
***************
*** 1737,1747 ****
  
    # Create directories.
    for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do
!     if test "$d" = build-aux; then
!       mkdir -p "$testdir/$auxdir"
!     else
!       mkdir -p "$testdir/$d"
!     fi
    done
  
    # Copy files or make symbolic links.
--- 1742,1754 ----
  
    # Create directories.
    for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do
!     case "$d" in
!       build-aux) mkdir -p "$testdir/$auxdir" ;;
!       lib)       mkdir -p "$testdir/$sourcebase" ;;
!       m4)        mkdir -p "$testdir/$m4base" ;;
!       tests)     mkdir -p "$testdir/$testsbase" ;;
!       *)         mkdir -p "$testdir/$d" ;;
!     esac
    done
  
    # Copy files or make symbolic links.
***************
*** 1749,1754 ****
--- 1756,1764 ----
      func_lookup_file "$f"
      case "$f" in
        build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+       lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
+       m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
+       tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;;
        *) g="$f" ;;
      esac
      if test -n "$lookedup_tmp"; then
***************
*** 1763,1774 ****
      fi
    done
  
!   # Create lib/Makefile.am.
!   mkdir -p "$testdir/lib"
!   func_emit_lib_Makefile_am > "$testdir/lib/Makefile.am"
  
!   # Create m4/Makefile.am.
!   mkdir -p "$testdir/m4"
    (echo "## Process this file with automake to produce Makefile.in."
     echo
     echo "EXTRA_DIST ="
--- 1773,1784 ----
      fi
    done
  
!   # Create $sourcebase/Makefile.am.
!   mkdir -p "$testdir/$sourcebase"
!   func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am"
  
!   # Create $m4base/Makefile.am.
!   mkdir -p "$testdir/$m4base"
    (echo "## Process this file with automake to produce Makefile.in."
     echo
     echo "EXTRA_DIST ="
***************
*** 1778,1789 ****
           echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;;
       esac
     done
!   ) > "$testdir/m4/Makefile.am"
  
!   subdirs="lib m4"
    subdirs_with_configure_ac=""
  
!   if test -f "$testdir"/m4/gettext.m4; then
      # Avoid stupid error message from automake:
      # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
      mkdir -p "$testdir/po"
--- 1788,1799 ----
           echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;;
       esac
     done
!   ) > "$testdir/$m4base/Makefile.am"
  
!   subdirs="$sourcebase $m4base"
    subdirs_with_configure_ac=""
  
!   if test -f "$testdir"/$m4base/gettext.m4; then
      # Avoid stupid error message from automake:
      # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
      mkdir -p "$testdir/po"
***************
*** 1793,1805 ****
    fi
  
    if test -n "$inctests"; then
!     test -d "$testdir/tests" || mkdir "$testdir/tests"
!     # Create tests/Makefile.am.
!     sourcebase=lib
!     m4base=m4
!     testsbase=tests
!     func_emit_tests_Makefile_am > "$testdir/tests/Makefile.am"
!     # Create tests/configure.ac.
      (echo "# Process this file with autoconf to produce a configure script."
       echo "AC_INIT([dummy], [0])"
       echo "AC_CONFIG_AUX_DIR([../$auxdir])"
--- 1803,1812 ----
    fi
  
    if test -n "$inctests"; then
!     test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase"
!     # Create $testsbase/Makefile.am.
!     func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am"
!     # Create $testsbase/configure.ac.
      (echo "# Process this file with autoconf to produce a configure script."
       echo "AC_INIT([dummy], [0])"
       echo "AC_CONFIG_AUX_DIR([../$auxdir])"
***************
*** 1812,1826 ****
       echo "AC_PROG_MAKE_SET"
       echo "AC_PROG_RANLIB"
       echo
!      if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
         echo "AC_GNU_SOURCE"
         echo
       fi
!      if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 
2>/dev/null; then
         echo "gl_USE_SYSTEM_EXTENSIONS"
         echo
       fi
!      if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
         echo "gl_LOCK_EARLY"
         echo
       fi
--- 1819,1833 ----
       echo "AC_PROG_MAKE_SET"
       echo "AC_PROG_RANLIB"
       echo
!      if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; 
then
         echo "AC_GNU_SOURCE"
         echo
       fi
!      if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 
2>/dev/null; then
         echo "gl_USE_SYSTEM_EXTENSIONS"
         echo
       fi
!      if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
         echo "gl_LOCK_EARLY"
         echo
       fi
***************
*** 1868,1881 ****
       echo "])"
       echo "gl_INIT"
       echo
!      # Usually tests/config.h will be a superset of config.h. Verify this by
!      # "merging" config.h into tests/config.h; look out for gcc warnings.
       echo "AH_TOP([#include \"../config.h\"])"
       echo
       echo "AC_OUTPUT([Makefile])"
!     ) > "$testdir/tests/configure.ac"
!     subdirs="$subdirs tests"
!     subdirs_with_configure_ac="$subdirs_with_configure_ac tests"
    fi
  
    # Create Makefile.am.
--- 1875,1888 ----
       echo "])"
       echo "gl_INIT"
       echo
!      # Usually $testsbase/config.h will be a superset of config.h. Verify this
!      # by "merging" config.h into $testsbase/config.h; look out for gcc 
warnings.
       echo "AH_TOP([#include \"../config.h\"])"
       echo
       echo "AC_OUTPUT([Makefile])"
!     ) > "$testdir/$testsbase/configure.ac"
!     subdirs="$subdirs $testsbase"
!     subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase"
    fi
  
    # Create Makefile.am.
***************
*** 1885,1891 ****
     echo
     echo "SUBDIRS = $subdirs"
     echo
!    echo "ACLOCAL_AMFLAGS = -I m4"
    ) > "$testdir/Makefile.am"
  
    # Create configure.ac.
--- 1892,1898 ----
     echo
     echo "SUBDIRS = $subdirs"
     echo
!    echo "ACLOCAL_AMFLAGS = -I $m4base"
    ) > "$testdir/Makefile.am"
  
    # Create configure.ac.
***************
*** 1907,1921 ****
     echo
     echo "AC_PROG_RANLIB"
     echo
!    if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
       echo "AC_GNU_SOURCE"
       echo
     fi
!    if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 
2>/dev/null; then
       echo "gl_USE_SYSTEM_EXTENSIONS"
       echo
     fi
!    if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
       echo "gl_LOCK_EARLY"
       echo
     fi
--- 1914,1928 ----
     echo
     echo "AC_PROG_RANLIB"
     echo
!    if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
       echo "AC_GNU_SOURCE"
       echo
     fi
!    if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 
2>/dev/null; then
       echo "gl_USE_SYSTEM_EXTENSIONS"
       echo
     fi
!    if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
       echo "gl_LOCK_EARLY"
       echo
     fi
***************
*** 1973,1982 ****
     echo "executing ${AUTORECONF} --force --install"
     ${AUTORECONF} --force --install
    )
!   if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then
      (cd "$testdir"
       ./configure
!        cd lib
         echo 'built_sources: $(BUILT_SOURCES)' >> Makefile
         make built_sources
         cd ..
--- 1980,1989 ----
     echo "executing ${AUTORECONF} --force --install"
     ${AUTORECONF} --force --install
    )
!   if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > 
/dev/null; then
      (cd "$testdir"
       ./configure
!        cd "$sourcebase"
         echo 'built_sources: $(BUILT_SOURCES)' >> Makefile
         make built_sources
         cd ..