X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=configure.in;h=51df22a2538d07d6c7f48fbfecec213bda928b22;hp=229a8b0158c5f7c16cd9ef7e6d6e64dce0e271c9;hb=1bfc403cc1a48a413f36c6b790f46e4f1a27ee93;hpb=1189b11aff1b36510367f17a0aedf2abccb66ec7

diff --git a/configure.in b/configure.in
index 229a8b0..51df22a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libftdi, 0.12)
+AM_INIT_AUTOMAKE(libftdi, 0.15)
 
 AC_LANG_C
 AC_PROG_CC
@@ -11,7 +11,7 @@ dnl check for libusb-config
 AC_PATH_PROG(HAVELIBUSB, libusb-config, $PATH)
 
 if test ! -z "$HAVELIBUSB"; then
-dnl   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
+   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
    LIBUSB_LIBS=`$HAVELIBUSB --libs`
 
    CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
@@ -32,21 +32,64 @@ else
    AC_MSG_RESULT(yes)
 fi
 
+ENABLE_ASYNC_MODE=0
 AC_ARG_WITH(async-mode,
 [  --with-async-mode       enable experimental async mode. Linux only.],
 [
   AC_MSG_CHECKING(for experimental linux async mode)
   if test "$withval" != "no"; then
+    ENABLE_ASYNC_MODE=1
     CFLAGS="$CFLAGS -DLIBFTDI_LINUX_ASYNC_MODE"
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
   fi
 ])
+AC_SUBST(ENABLE_ASYNC_MODE)
+
+LIBFTDI_MODULES=
+LIBFTDI_MODULES_PKGCONFIG=
+
+dnl libftdi C++ wrapper. Needs boost.
+AX_BOOST_BASE([1.33])
+ENABLE_LIBFTDIPP=0
+AC_MSG_CHECKING(if we can build the C++ wrapper)
+AC_ARG_ENABLE(libftdipp,
+                          AS_HELP_STRING([--enable-libftdipp],
+                                                     [enable libftdi C++ wrapper. Needs boost (default: auto)]),
+[
+    if test "$enableval" != "no"; then
+        if test "x$HAVE_BOOST" != "xyes"; then
+            AC_MSG_ERROR(Sorry, we need the boost library for the C++ wrapper)
+        fi
+        ENABLE_LIBFTDIPP=1
+    fi
+],
+[
+    dnl Build the wrapper if we got the boost library
+    if test "x$HAVE_BOOST" = "xyes"; then
+        ENABLE_LIBFTDIPP=1
+    fi
+])
+if test "x$ENABLE_LIBFTDIPP" = "x1"; then
+    LIBFTDI_MODULES="$LIBFTDI_MODULES ftdipp"
+    LIBFTDI_MODULES_PKGCONFIG="$LIBFTDI_MODULES_PKGCONFIG libftdipp.pc"
+    AC_MSG_RESULT(yes)
+else
+    AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(HAVE_LIBFTDIPP, [test "x$ENABLE_LIBFTDIPP" = "x1"])
 
 dnl check for doxygen
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN)
 
+AC_SUBST(LIBFTDI_MODULES)
+AC_SUBST(LIBFTDI_MODULES_PKGCONFIG)
+
 AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config])
-AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc)
+AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc libftdi.spec)
+
+if test "x$ENABLE_LIBFTDIPP" = "x1"; then
+    AC_OUTPUT(ftdipp/Makefile libftdipp.pc)
+fi