[Openocd-svn] r2482 - in trunk: . src/helper

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2009-07-06 17:19:10 +0200 (Mon, 06 Jul 2009)
New Revision: 2482

Modified:
   trunk/configure.in
   trunk/src/helper/replacements.h
Log:
- fix build when using a cross compiler - do not try and run any host tools
- add missing types.h when platform does not contain elf.h

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-07-06 15:04:20 UTC (rev 2481)
+++ trunk/configure.in	2009-07-06 15:19:10 UTC (rev 2482)
@@ -824,7 +824,9 @@
     AC_MSG_RESULT([Success!])
   ], [
     AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib])
-  ] )
+  ], [
+    AC_MSG_RESULT([Skipping as we are cross-compiling])
+  ])
 
 AC_MSG_CHECKING([whether to build ftd2xx highspeed device support])
 AC_MSG_RESULT([$want_ftd2xx_highspeed])
@@ -891,7 +893,10 @@
       AC_MSG_RESULT([Success])
     ], [
       AC_MSG_ERROR([Cannot build & run test program using libftdi])
+    ], [
+      AC_MSG_RESULT([Skipping as we are cross-compiling])
     ])
+
   # Restore the 'unexpanded ldflags'
   LDFLAGS=$LDFLAGS_SAVE
   CFLAGS=$CFLAGS_SAVE

Modified: trunk/src/helper/replacements.h
===================================================================
--- trunk/src/helper/replacements.h	2009-07-06 15:04:20 UTC (rev 2481)
+++ trunk/src/helper/replacements.h	2009-07-06 15:19:10 UTC (rev 2482)
@@ -210,6 +210,8 @@
 
 #ifndef HAVE_ELF_H
 
+#include "types.h"
+
 typedef uint32_t	Elf32_Addr;
 typedef uint16_t	Elf32_Half;
 typedef uint32_t	Elf32_Off;