Remove --enable-release option; if guess-rev.sh is missing, it is a release.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2456 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-07-02 11:17:14 +00:00
parent f1f54a0fc5
commit 00fad24996
2 changed files with 11 additions and 13 deletions

5
README
View File

@ -252,11 +252,6 @@ The following additional options may also be useful:
--disable-wextra Disable extra compiler warnings --disable-wextra Disable extra compiler warnings
--disable-werror Do not treat warnings as errors --disable-werror Do not treat warnings as errors
--enable-release Enable building of an OpenOCD release. This
option is intended for project maintainers.
It simply omits the svn version string when
the openocd -v is executed (to KISS).
--disable-option-checking --disable-option-checking
Ignore unrecognized --enable and --with options. Ignore unrecognized --enable and --with options.
--disable-dependency-tracking speeds up one-time build --disable-dependency-tracking speeds up one-time build

View File

@ -89,17 +89,20 @@ is_cygwin=no
is_mingw=no is_mingw=no
is_win32=no is_win32=no
is_darwin=no is_darwin=no
build_release=yes
AC_ARG_ENABLE(release,
AS_HELP_STRING([--enable-release], [Enable Release Build, default no]),
[build_release=$enableval], [build_release=no])
if test $cross_compiling = no; then if test $cross_compiling = no; then
if test $build_release = no; then # guess-rev.sh only exists in the repository, not in the released archives
# check we can find guess-rev.sh AC_CHECK_FILE("$srcdir/guess-rev.sh", has_guess_rev=yes, has_guess_rev=no)
AC_CHECK_FILE("$srcdir/guess-rev.sh", build_release=no, build_release=yes)
AC_MSG_CHECKING([whether to build a release])
if test $has_guess_rev = no; then
build_release=yes
else
build_release=no
fi fi
AC_MSG_RESULT($build_release)
else
build_release=yes
fi fi
# We are not *ALWAYS* being installed in the standard place. # We are not *ALWAYS* being installed in the standard place.