X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=792e6f8c7401bf33c2319699e8bf9a24d373fec4;hp=8f3bbdf129ed8bc1480badc3617be26a8521a006;hb=64e53c4fd8a5da944de57716b137a7dff5e67b63;hpb=21eff7095c50bcdc74000e6cda0c76aa3d16b854

diff --git a/configure.in b/configure.in
index 8f3bbdf129..792e6f8c74 100644
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,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.
@@ -36,15 +48,26 @@ is_win32=no
 # And - if we are being installed there - the odds are
 # The libraries unique to what we are are there too.
 #
+
+# Expand nd deal with NONE - just like configure will do later
+OCDprefix=$prefix
+OCDxprefix=$exec_prefix
+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 $exec_prefix != $ac_default_prefix
+if test "$OCDxprefix" != "$ac_default_prefix"
 then
+    # We are installing in a non-standard place
+    # Nonstandard --prefix and/or --exec-prefix
+    # We have an override of some sort.
     # use build specific install library dir
-    LDFLAGS="$LDFLAGS -L$libdir"
+    
+    LDFLAGS="$LDFLAGS -L$OCDxprefix/lib"
     # RPATH becomes an issue on Linux only
-    if test $host_os = linux-gnu
-    then
-	LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+    if test $host_os = linux-gnu || test $host_os = linux ; then
+	LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
     fi
     # The "INCDIR" is also usable
     CFLAGS="$CFLAGS -I$includedir"
@@ -110,7 +133,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>]),
@@ -133,7 +155,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]),
 [
@@ -251,7 +272,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
@@ -302,7 +322,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.])
@@ -452,12 +471,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
 	;;
@@ -475,7 +494,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
@@ -487,7 +505,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?
@@ -617,12 +635,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)
@@ -701,6 +718,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)