X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=configure.in;h=959731134ce6ce13e160ce5c23be214906413d7d;hp=3b3f96a52e8aa5f75ad7af7ecef38eb18c3d1470;hb=ade814a59b4660c5af865dd86cdd48cfa55e1ae5;hpb=e81598e4752debbc926108e4526b124f06e063b6

diff --git a/configure.in b/configure.in
index 3b3f96a..9597311 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(libftdi, 0.16)
+AC_INIT(libftdi, 0.17)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
@@ -7,45 +7,25 @@ AC_PROG_CC
 AM_PROG_LIBTOOL
 AC_PROG_CXX
 
-dnl check for libusb-config
-AC_PATH_PROG(HAVELIBUSB, libusb-config, $PATH)
-
-if test ! -z "$HAVELIBUSB"; then
-   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
-   LIBUSB_LIBS=`$HAVELIBUSB --libs`
-
-   CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
-   LIBS="$LIBS $LIBUSB_LIBS"
+AC_CONFIG_MACRO_DIR([m4])
+
+dnl check for libusb-1.0
+have_libusb_1_0=no
+PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no)
+if test "$have_libusb_1_0" = "yes"; then
+  CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
+  CXXFLAGS="$CXXFLAGS $LIBUSB_1_0_CFLAGS"
+  USB_LIBS="$USB_LIBS $LIBUSB_1_0_LIBS"
+  HAVE_USB=yes
+  AC_DEFINE(HAVE_LIBUSB_1_0, 1, [Define to 1 if you have libusb-1.0.])
+  AC_SUBST(USB_LIBS)
 else
-   AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
+  AC_MSG_ERROR([libusb-1.0 not found.])
 fi
 
-dnl check for version of libusb
-AC_MSG_CHECKING([if libusb version is >= 0.1.7])
-libusb_version_needed="1007"
-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
-
-if test $libusb_version -lt $libusb_version_needed; then
-   AC_MSG_RESULT(no)
-   AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
-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)
+AC_ARG_WITH(examples,
+  AS_HELP_STRING([--without-examples], [disable example programs]))
+AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$with_examples" != "xno"])
 
 LIBFTDI_MODULES=
 LIBFTDI_MODULES_PKGCONFIG=
@@ -81,7 +61,13 @@ fi
 AM_CONDITIONAL(HAVE_LIBFTDIPP, [test "x$ENABLE_LIBFTDIPP" = "x1"])
 
 dnl check for doxygen
-AC_PATH_PROG(DOXYGEN, doxygen)
+AC_ARG_WITH(docs,
+  AS_HELP_STRING([--without-docs], [disable doxygen usage]))
+if test "x$with_docs" != "xno"; then
+  AC_PATH_PROG(DOXYGEN, doxygen)
+else
+  DOXYGEN=
+fi
 AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN)
 
 dnl ============================
@@ -140,9 +126,11 @@ fi
 AC_SUBST(LIBFTDI_MODULES)
 AC_SUBST(LIBFTDI_MODULES_PKGCONFIG)
 
-AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config])
-AC_OUTPUT(Makefile src/Makefile bindings/Makefile bindings/python/Makefile bindings/python/setup.py examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc libftdi.spec)
+AC_CONFIG_FILES([libftdi-config],[chmod a+x libftdi-config])
+AC_CONFIG_FILES(Makefile src/Makefile bindings/Makefile bindings/python/Makefile bindings/python/setup.py examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc libftdi.spec)
 
 if test "x$ENABLE_LIBFTDIPP" = "x1"; then
-    AC_OUTPUT(ftdipp/Makefile libftdipp.pc)
+    AC_CONFIG_FILES(ftdipp/Makefile libftdipp.pc)
 fi
+
+AC_OUTPUT