diff --git a/.gitignore b/.gitignore index 0652da3..eff76fa 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ config.sub config_h.in configure depcomp -gnulib intl m4 mdate-sh diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..acb2669 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "gnulib"] + path = gnulib + url = git://git.sv.gnu.org/gnulib.git diff --git a/autoboot b/autoboot index 3c0de90..7a66cd3 100755 --- a/autoboot +++ b/autoboot @@ -233,11 +233,20 @@ cleanup_gnulib() { exit $status } +git_modules_config () { + GIT_CONFIG_LOCAL=.gitmodules git config "$@" +} + # Get gnulib files. case ${GNULIB_SRCDIR--} in -) - if [ ! -d gnulib ]; then + if git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + git submodule init || exit $@ + git submodule update || exit $@ + + elif [ ! -d gnulib ]; then echo "$0: getting gnulib files..." trap cleanup_gnulib 1 2 13 15 @@ -248,6 +257,19 @@ case ${GNULIB_SRCDIR--} in trap - 1 2 13 15 fi GNULIB_SRCDIR=gnulib + ;; +*) + # Redirect the gnulib submodule to the directory on the command line + # if possible. + if test -d $GNULIB_SRCDIR/.git && \ + git_modules_config submodule.gnulib.url >/dev/null; then + git submodule init + git config --replace-all submodule.gnulib.url "`cd $GNULIB_SRCDIR && pwd`" + echo "$0: getting gnulib files..." + git submodule update || exit $@ + GNULIB_SRCDIR=gnulib + fi + ;; esac gnulib_tool=$GNULIB_SRCDIR/gnulib-tool diff --git a/gnulib b/gnulib new file mode 160000 index 0000000..4d12840 --- /dev/null +++ b/gnulib @@ -0,0 +1 @@ +Subproject commit 4d12840eee3fff74725edcf612345b15f1b02ddd