Fixes for handling release versions

[fw/openocd] / configure.in

diff --git a/configure.in b/configure.in
index 3681da95991d9d421d65cbb09b7c34b85cb13f58..dd2c70b7d015c65da84ee5bb7cfdd52fcf73400a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,16 @@ 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 $build_release = no; then
+       # check we can find guess-rev.sh
+       AC_CHECK_FILE("guess-rev.sh", build_release=no, build_release=yes)
+fi
 
 # We are not *ALWAYS* being installed in the standard place.
 # We may be installed in a "tool-build" specific location.
@@ -44,7 +54,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
@@ -55,8 +64,7 @@ then
     
     LDFLAGS="$LDFLAGS -L$OCDxprefix/lib"
     # RPATH becomes an issue on Linux only
-    if test $host_os = linux-gnu
-    then
+    if test $host_os = linux-gnu || test $host_os = linux ; then
        LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
     fi
     # The "INCDIR" is also usable
@@ -123,7 +131,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>]),
@@ -146,7 +153,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]),
 [
@@ -264,7 +270,6 @@ AC_ARG_ENABLE(rlink,
   AS_HELP_STRING([--enable-rlink], [Enable building support for the Raisonance RLink JTAG Programmer]),
   [build_rlink=$enableval], [build_rlink=no])
 
-
 case $host in 
   *-cygwin*) 
     is_win32=yes
@@ -315,7 +320,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.])
@@ -465,12 +469,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
        ;;
@@ -488,7 +492,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
@@ -500,7 +503,7 @@ if test $build_ft2232_ftd2xx = yes ; then
    AC_MSG_CHECKING([for libftd2xx.a (linux)])
    # Must be linux -
    # Cause FTDICHIP does not supply a MAC-OS version
-   if test $host_os != linux-gnu; then
+   if test $host_os != linux-gnu && test $host_os != linux ; then
       AC_MSG_ERROR([The (linux) ftd2xx library from FTDICHIP.com is linux only. Try --enable-ft2232-libftdi instead])
    fi
    # Are we given a TAR directory?
@@ -630,12 +633,11 @@ main( int argc, char **argv )
 LDFLAGS=$LDFLAGS_SAVE
 CFLAGS=$CFLAGS_SAVE
 fi
-   
-
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(openocd, 1.0)
 
+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)
@@ -714,6 +716,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)