projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore -dev suffix, archive NEWS file, add new blank NEWS file - start
[fw/openocd]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index f985bcd45a61073e881493823545c3d58ee02079..30da60e077c3aece712fa52d86b52fb3efaf3648 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
AC_PREREQ(2.60)
AC_PREREQ(2.60)
-AC_INIT([openocd], [0.
6.0-rc1
],
+AC_INIT([openocd], [0.
7.0-dev
],
[OpenOCD Mailing List <openocd-devel@lists.sourceforge.net>])
AC_CONFIG_SRCDIR([src/openocd.c])
[OpenOCD Mailing List <openocd-devel@lists.sourceforge.net>])
AC_CONFIG_SRCDIR([src/openocd.c])
@@
-224,7
+224,7
@@
__EOF__
# In case (1) and (2) we need to know where the package was unpacked.
AC_ARG_WITH(ftd2xx-win32-zipdir,
# In case (1) and (2) we need to know where the package was unpacked.
AC_ARG_WITH(ftd2xx-win32-zipdir,
- AS_HELP_STRING([--with-ftd2xx-win32-zipdir],[Where (CYGWIN/MINGW) the zip file from ftdichip.com was unpacked
<default=search>
]),
+ AS_HELP_STRING([--with-ftd2xx-win32-zipdir],[Where (CYGWIN/MINGW) the zip file from ftdichip.com was unpacked
(default=search)
]),
[
# option present
if test -d $with_ftd2xx_win32_zipdir
[
# option present
if test -d $with_ftd2xx_win32_zipdir
@@
-237,7
+237,7
@@
AC_ARG_WITH(ftd2xx-win32-zipdir,
], [true])
AC_ARG_WITH(ftd2xx-linux-tardir,
], [true])
AC_ARG_WITH(ftd2xx-linux-tardir,
- AS_HELP_STRING([--with-ftd2xx-linux-tardir], [Where (Linux/Unix) the tar file from ftdichip.com was unpacked
<default=search>
]),
+ AS_HELP_STRING([--with-ftd2xx-linux-tardir], [Where (Linux/Unix) the tar file from ftdichip.com was unpacked
(default=search)
]),
[
# Option present
if test $is_win32 = yes ; then
[
# Option present
if test $is_win32 = yes ; then
@@
-254,7
+254,7
@@
AC_ARG_WITH(ftd2xx-linux-tardir,
AC_ARG_WITH(ftd2xx-lib,
AS_HELP_STRING([--with-ftd2xx-lib],
AC_ARG_WITH(ftd2xx-lib,
AS_HELP_STRING([--with-ftd2xx-lib],
- [Use static or shared ftd2xx libs
on default static
]),
+ [Use static or shared ftd2xx libs
(default=static)
]),
[
case "$withval" in
static)
[
case "$withval" in
static)
@@
-816,7
+816,7
@@
if test $build_remote_bitbang = yes; then
build_bitbang=yes
AC_DEFINE([BUILD_REMOTE_BITBANG], [1], [1 if you want the Remote Bitbang JTAG driver.])
else
build_bitbang=yes
AC_DEFINE([BUILD_REMOTE_BITBANG], [1], [1 if you want the Remote Bitbang JTAG driver.])
else
- AC_DEFINE([BUILD_REMOTE_BITB
NA
G], [0], [0 if you don't want the Remote Bitbang JTAG driver.])
+ AC_DEFINE([BUILD_REMOTE_BITB
AN
G], [0], [0 if you don't want the Remote Bitbang JTAG driver.])
fi
#-- Deal with MingW/Cygwin FTD2XX issues
fi
#-- Deal with MingW/Cygwin FTD2XX issues