diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/bindle-git.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/m4/bindle-git.m4 b/m4/bindle-git.m4 index bac8469..0567b69 100644 --- a/m4/bindle-git.m4 +++ b/m4/bindle-git.m4 | |||
| @@ -44,7 +44,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 44 | GPV="" # Git package version (x.x.x). | 44 | GPV="" # Git package version (x.x.x). |
| 45 | GIT_PACKAGE_BUILD="" # Git package build (gbbbbb). | 45 | GIT_PACKAGE_BUILD="" # Git package build (gbbbbb). |
| 46 | GIT_CACHED_STRING="" # Cached git package version string. | 46 | GIT_CACHED_STRING="" # Cached git package version string. |
| 47 | GCF="" # Cached git file. | 47 | GIT_CACHE_FILE="" # Cached git file. |
| 48 | GIT_TARBALL_VERSION="" # Git Tarball Version (x.x.0 or x.x.x.gbbbbb). | 48 | GIT_TARBALL_VERSION="" # Git Tarball Version (x.x.0 or x.x.x.gbbbbb). |
| 49 | GPN="" # git package name. | 49 | GPN="" # git package name. |
| 50 | GOD="" # git out directory | 50 | GOD="" # git out directory |
| @@ -84,24 +84,24 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 84 | if test "x${GIT_PACKAGE_VERSION_BUILD}" == "x";then | 84 | if test "x${GIT_PACKAGE_VERSION_BUILD}" == "x";then |
| 85 | # determines location of cache file | 85 | # determines location of cache file |
| 86 | if test "x${GOD}" != "x" && test -f "${GOD}/git-package-version.txt";then | 86 | if test "x${GOD}" != "x" && test -f "${GOD}/git-package-version.txt";then |
| 87 | GCF="${GOD}/git-package-version.txt" | 87 | GIT_CACHE_FILE="${GOD}/git-package-version.txt" |
| 88 | 88 | ||
| 89 | elif test -f "${srcdir}/build-aux/git-package-version.txt";then | 89 | elif test -f "${srcdir}/build-aux/git-package-version.txt";then |
| 90 | GCF="${srcdir}/build-aux/git-package-version.txt" | 90 | GIT_CACHE_FILE="${srcdir}/build-aux/git-package-version.txt" |
| 91 | 91 | ||
| 92 | elif test -f "${srcdir}/include/git-package-version.txt";then | 92 | elif test -f "${srcdir}/include/git-package-version.txt";then |
| 93 | GCF="${srcdir}/include/git-package-version.txt" | 93 | GIT_CACHE_FILE="${srcdir}/include/git-package-version.txt" |
| 94 | 94 | ||
| 95 | elif test -f "${srcdir}/build-aux/git-tar-name.txt";then | 95 | elif test -f "${srcdir}/build-aux/git-tar-name.txt";then |
| 96 | GPN=$(cat "${srcdir}/build-aux/git-tar-name.txt" 2> /dev/null) | 96 | GPN=$(cat "${srcdir}/build-aux/git-tar-name.txt" 2> /dev/null) |
| 97 | if test -f "${srcdir}/${GPN}/git-package-version.txt";then | 97 | if test -f "${srcdir}/${GPN}/git-package-version.txt";then |
| 98 | GCF="${srcdir}/${GPN}/git-package-version.txt" | 98 | GIT_CACHE_FILE="${srcdir}/${GPN}/git-package-version.txt" |
| 99 | fi | 99 | fi |
| 100 | fi | 100 | fi |
| 101 | 101 | ||
| 102 | # reads cache file and saves results | 102 | # reads cache file and saves results |
| 103 | if test "x${GCF}" != "x";then | 103 | if test "x${GIT_CACHE_FILE}" != "x";then |
| 104 | GIT_CACHED_STRING=$(cat ${GCF} 2> /dev/null) | 104 | GIT_CACHED_STRING=$(cat ${GIT_CACHE_FILE} 2> /dev/null) |
| 105 | fi | 105 | fi |
| 106 | if test "x${GIT_CACHED_STRING}" != "x";then | 106 | if test "x${GIT_CACHED_STRING}" != "x";then |
| 107 | GIT_PACKAGE_VERSION_BUILD=${GIT_CACHED_STRING} | 107 | GIT_PACKAGE_VERSION_BUILD=${GIT_CACHED_STRING} |
| @@ -142,7 +142,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 142 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} | 142 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} |
| 143 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} | 143 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} |
| 144 | VERSION=${GIT_TARBALL_VERSION} | 144 | VERSION=${GIT_TARBALL_VERSION} |
| 145 | CONFIG_STATUS_DEPENDENCIES="${GCF} ${CONFIG_STATUS_DEPENDENCIES}" | 145 | CONFIG_STATUS_DEPENDENCIES="${GIT_CACHE_FILE} ${CONFIG_STATUS_DEPENDENCIES}" |
| 146 | # | 146 | # |
| 147 | # set substitution variables | 147 | # set substitution variables |
| 148 | AC_SUBST([GIT_VERSION_SCRIPT], [${GIT_VERSION_SCRIPT}]) | 148 | AC_SUBST([GIT_VERSION_SCRIPT], [${GIT_VERSION_SCRIPT}]) |
