server: use register_commands

[fw/openocd] / configure.in

diff --git a/configure.in b/configure.in
index 57723838f92455d061ff1b2f8efbf52d78c632be..81e4326278daad9bbbf191923599dd0e27fa9d12 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([openocd], [0.3.0-rc1-dev],
+AC_INIT([openocd], [0.4.0-dev],
   [OpenOCD Mailing List <openocd-development@lists.berlios.de>])
 AC_CONFIG_SRCDIR([src/openocd.c])
 
@@ -277,6 +277,24 @@ AC_ARG_WITH(ftd2xx-lib,
   with_ftd2xx_lib=static
   ])
 
+
+AC_ARG_ENABLE(doxygen-html,
+  AS_HELP_STRING([--disable-doxygen-html],
+    [Disable building Doxygen manual as HTML.]),
+  [doxygen_as_html=$enableval], [doxygen_as_html=yes])
+AC_SUBST(doxygen_as_html)
+AC_MSG_CHECKING([whether to build Doxygen as HTML])
+AC_MSG_RESULT($doxygen_as_html)
+
+AC_ARG_ENABLE(doxygen-pdf,
+  AS_HELP_STRING([--enable-doxygen-pdf],
+    [Enable building Doxygen manual as PDF.]),
+  [doxygen_as_pdf=$enableval], [doxygen_as_pdf=no])
+AC_SUBST(doxygen_as_pdf)
+AC_MSG_CHECKING([whether to build Doxygen as PDF])
+AC_MSG_RESULT($doxygen_as_pdf)
+
+
 AC_ARG_ENABLE(gccwarnings,
   AS_HELP_STRING([--disable-gccwarnings], [Disable compiler warnings]),
   [gcc_warnings=$enableval], [gcc_warnings=yes])
@@ -736,12 +754,12 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then
 
     # And calculate the LDFLAGS for the machine
     case "$host_cpu" in
-    i?86|x86_*)
+    i?86|x86_32)
       LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/i386"
       LIBS="$LIBS -lftd2xx"
       f=$with_ftd2xx_win32_zipdir/i386/ftd2xx.lib
       ;;
-    amd64)
+    amd64|x86_64)
       LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/amd64"
       LIBS="$LIBS -lftd2xx"
       f=$with_ftd2xx_win32_zipdir/amd64/ftd2xx.lib
@@ -978,6 +996,7 @@ if test $build_jlink = yes -o $build_vsllink = yes -o $build_usbprog = yes -o \
 then
   AC_CHECK_HEADERS([usb.h],[],
   [AC_MSG_ERROR([usb.h is required to build some OpenOCD driver(s)])])
+  build_usb=yes
 fi
 
 AM_CONDITIONAL(RELEASE, test $build_release = yes)
@@ -1003,6 +1022,7 @@ 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(USB, test $build_usb = 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)