From 1765dcefe233c0e163e9b3984bd0674133ef5661 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Mon, 27 Jun 2005 10:46:41 +0000 Subject: [PATCH] 2005-06-27 Marcel Telka * autogen.sh: Used autoreconf call for initial configuration. * configure.ac: Added initial support for Hitachi Workbench. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@647 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- include/ChangeLog | 5 +++++ include/NEWS | 1 + include/autogen.sh | 25 ++++++++++++------------- include/configure.ac | 29 +++++++++++++++++++++++++---- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 3f38bc0f..acfda256 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2005-06-27 Marcel Telka + + * autogen.sh: Used autoreconf call for initial configuration. + * configure.ac: Added initial support for Hitachi Workbench. + 2005-06-16 Branislav Petrovsky * h8/h8s2357/mcu.h (SBYCR, SYSCR, SCKCR, MDCR, MSTPCRH, MSTPCRL) diff --git a/include/NEWS b/include/NEWS index 337b9012..a57c7781 100644 --- a/include/NEWS +++ b/include/NEWS @@ -10,6 +10,7 @@ include-0.3.3: * Ported uintptr_t type in win32/stdint.h to old Windows SDK. * Changes in brux common headers: - Added new parameter (adr) for detectflash function + * Added support for Hitachi Workbench. include-0.3.2 (2003-10-11): diff --git a/include/autogen.sh b/include/autogen.sh index 84d65b7d..909bdd11 100755 --- a/include/autogen.sh +++ b/include/autogen.sh @@ -28,21 +28,20 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Written by Marcel Telka , 2002. +# Written by Marcel Telka , 2002, 2005. # -echo "Running aclocal ..." -aclocal +export AUTOMAKE="/usr/bin/automake --foreign" -echo "Running automake ..." -automake --add-missing --foreign +if autoreconf -i -s -v ; then + echo + echo "autoreconf done." + echo +else + echo + echo "autoreconf failed." + echo + exit 1 +fi -echo "Running autoconf ..." -autoconf - -echo -echo "Now running ./configure script..." ./configure --enable-maintainer-mode - -echo -echo "Type \`make\` to build include..." diff --git a/include/configure.ac b/include/configure.ac index d1dfcb54..e1cb9753 100644 --- a/include/configure.ac +++ b/include/configure.ac @@ -2,6 +2,7 @@ # $Id$ # # Copyright (C) 2002 ETC s.r.o. +# Copyright (C) 2005 Elcom s.r.o. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,7 +28,7 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Written by Marcel Telka , 2002. +# Written by Marcel Telka , 2002, 2005. # AC_INIT(include,0.3.3) @@ -45,8 +46,28 @@ AC_CONFIG_FILES( AM_MAINTAINER_MODE -AX_CREATE_STDINT_H( owce-stdint.h ) -AC_CHECK_HEADERS( stdint.h ) -AM_CONDITIONAL( GENERATE_STDINT_H, test x$ac_cv_header_stdint_h = xno ) +AC_ARG_WITH(hwbench, + AC_HELP_STRING([--with-hwbench=PATH], [Absolute path to the hwbench installation]), + with_hwbench="$withval") + +AC_CACHE_CHECK([for hwbench installation], hwbench_path, [ + hwbench_path="no" + for hwb_path in "$with_hwbench"; do + if test -f "$hwb_path/IAR/EXE/ICCH83.EXE"; then + hwbench_path="$hwb_path" + export CC="$hwb_path/IAR/EXE/ICCH83.EXE" + break + fi + done +]) + +generate_stdint_h="no" +AC_CHECK_HEADERS( stdint.h, [], [ + if test "$hwbench_path" = "no"; then + AX_CREATE_STDINT_H( owce-stdint.h ) + generate_stdint_h="yes" + fi +]) +AM_CONDITIONAL( GENERATE_STDINT_H, test "$generate_stdint_h" = "yes" ) AC_OUTPUT