X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.in;h=21f2295ef6a67137609172be095341866309391c;hb=8ac5bd7030242c60858838d822a7c2edbf8cdcb6;hp=332551ee2f0ed6c0f2b39e9841c1866c762a1543;hpb=abaa61adf7e63d7786397c6220e0168827a14c59;p=openocd.git

diff --git a/configure.in b/configure.in
index 332551ee2f..21f2295ef6 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,7 @@ AC_CHECK_HEADERS(sys/param.h)
 AC_CHECK_HEADERS(sys/time.h)
 AC_CHECK_HEADERS(elf.h)
 AC_CHECK_HEADERS(strings.h)
+AC_CHECK_HEADERS(stdbool.h)
 
 AC_HEADER_TIME
 
@@ -27,6 +28,18 @@ build_bitq=no
 is_cygwin=no
 is_mingw=no
 is_win32=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 $build_release = no; then
+		# check we can find guess-rev.sh
+		AC_CHECK_FILE("$srcdir/guess-rev.sh", build_release=no, build_release=yes)
+	fi
+fi
 
 # We are not *ALWAYS* being installed in the standard place.
 # We may be installed in a "tool-build" specific location.
@@ -44,7 +57,6 @@ test x"$OCDprefix"  = xNONE && OCDprefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix"
 
-
 # what matters is the "exec-prefix"
 if test "$OCDxprefix" != "$ac_default_prefix"
 then
@@ -68,7 +80,7 @@ AC_ARG_WITH(ftd2xx,
 # Option Given.
 cat << __EOF__
 
-The option: --with-ftd2xx=<PATH> has been removed replaced.
+The option: --with-ftd2xx=<PATH> has been removed.
 On Linux, the new option is:
   
   --with-ftd2xx-linux-tardir=/path/to/files
@@ -122,7 +134,6 @@ AC_ARG_WITH(ftd2xx-win32-zipdir,
   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>]),
@@ -145,7 +156,6 @@ AC_ARG_WITH(ftd2xx-linux-tardir,
   ]
 )
 
-
 AC_ARG_WITH(ftd2xx-lib,
 	AS_HELP_STRING([--with-ftd2xx-lib], [Use static or shared ftd2xx libs on default static]),
 [
@@ -263,6 +273,9 @@ AC_ARG_ENABLE(rlink,
   AS_HELP_STRING([--enable-rlink], [Enable building support for the Raisonance RLink JTAG Programmer]),
   [build_rlink=$enableval], [build_rlink=no])
 
+AC_ARG_ENABLE(arm-jtag-ew,
+  AS_HELP_STRING([--enable-arm-jtag-ew], [Enable building support for the Olimex ARM-JTAG-EW Programmer]),
+  [build_armjtagew=$enableval], [build_armjtagew=no])
 
 case $host in 
   *-cygwin*) 
@@ -314,7 +327,6 @@ else
   AC_DEFINE(BUILD_DUMMY, 0, [0 if you don't want dummy driver.])
 fi
 
-
 if test $build_ep93xx = yes; then
   build_bitbang=yes
   AC_DEFINE(BUILD_EP93XX, 1, [1 if you want ep93xx.])
@@ -440,6 +452,12 @@ else
   AC_DEFINE(BUILD_RLINK, 0, [0 if you don't want the RLink JTAG driver.])
 fi
 
+if test $build_armjtagew = yes; then
+  AC_DEFINE(BUILD_ARMJTAGEW, 1, [1 if you want the ARM-JTAG-EW JTAG driver.])
+else
+  AC_DEFINE(BUILD_ARMJTAGEW, 0, [0 if you don't want the ARM-JTAG-EW JTAG driver.])
+fi
+
 #-- Deal with MingW/Cygwin FTD2XX issues
 
 if test $is_win32 = yes; then
@@ -464,12 +482,12 @@ AC_MSG_CHECKING([for ftd2xx.lib exists (win32)])
       # And calculate the LDFLAGS for the machine
       case "$host_cpu" in
       i?86|x86_*)
-	LDFLAGS="$LFLAGS -L$with_ftd2xx_win32_zipdir/i386"
+	LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/i386"
 	LIBS="$LIBS -lftd2xx"
 	f=$with_ftd2xx_win32_zipdir/i386/ftd2xx.lib
 	;;
       amd64)
-	LDFLAGS="$LFLAGS -L$with_ftd2xx_win32_zipdir/amd64"
+	LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/amd64"
 	LIBS="$LIBS -lftd2xx"
 	f=$with_ftd2xx_win32_zipdir/amd64/ftd2xx.lib
 	;;
@@ -487,7 +505,6 @@ AC_MSG_CHECKING([for ftd2xx.lib exists (win32)])
 fi
 fi
 
-
 if test $is_win32 = no; then
 
 if test "${with_ftd2xx_win32_zipdir+set}" = set
@@ -629,12 +646,12 @@ main( int argc, char **argv )
 LDFLAGS=$LDFLAGS_SAVE
 CFLAGS=$CFLAGS_SAVE
 fi
-   
-
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(openocd, 1.0)
+AM_MAINTAINER_MODE
 
+AM_CONDITIONAL(RELEASE, test $build_release = yes)
 AM_CONDITIONAL(PARPORT, test $build_parport = yes)
 AM_CONDITIONAL(DUMMY, test $build_dummy = yes)
 AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes)
@@ -655,6 +672,7 @@ AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes)
 AM_CONDITIONAL(JLINK, test $build_jlink = yes)
 AM_CONDITIONAL(VSLLINK, test $build_vsllink = yes)
 AM_CONDITIONAL(RLINK, test $build_rlink = yes)
+AM_CONDITIONAL(ARMJTAGEW, test $build_armjtagew = yes)
 AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes)
 AM_CONDITIONAL(IS_MINGW, test $is_mingw = yes)
 AM_CONDITIONAL(IS_WIN32, test $is_win32 = yes)
@@ -713,6 +731,4 @@ fi
 AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
 AC_SUBST(EXEEXT_FOR_BUILD)
 
-#AC_SUBST(WITH_FTD2XX, $with_ftd2xx)
-
-AC_OUTPUT(Makefile src/Makefile src/helper/Makefile src/jtag/Makefile src/xsvf/Makefile src/target/Makefile src/server/Makefile src/flash/Makefile src/pld/Makefile doc/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/helper/Makefile src/jtag/Makefile src/xsvf/Makefile src/svf/Makefile src/target/Makefile src/server/Makefile src/flash/Makefile src/pld/Makefile doc/Makefile)