From df4edacd55663aecee58a9b3f95cbc08bceaab81 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan <jcorgan@corganenterprises.com> Date: Tue, 29 Sep 2009 18:29:44 -0700 Subject: Consolidate conditional headers into libusb_types.h, use automake --- config/usrp_fusb_tech.m4 | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config/usrp_fusb_tech.m4') diff --git a/config/usrp_fusb_tech.m4 b/config/usrp_fusb_tech.m4 index 200cb36af3..cd08e18e59 100644 --- a/config/usrp_fusb_tech.m4 +++ b/config/usrp_fusb_tech.m4 @@ -26,6 +26,7 @@ dnl AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ req_libusb1=no + USE_LIBUSB1=0 AC_ARG_WITH([fusb-tech], AC_HELP_STRING([--with-fusb-tech=OS], [Set fast USB technique (default=auto)]), @@ -36,6 +37,7 @@ AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ libusb1*) FUSB_TECH=libusb1 req_libusb1=yes + USE_LIBUSB1=1 ;; linux*) AC_CHECK_HEADER([linux/usbdevice_fs.h], @@ -77,4 +79,9 @@ AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ AM_CONDITIONAL(FUSB_TECH_linux, test x$FUSB_TECH = xlinux) AM_CONDITIONAL(FUSB_TECH_libusb1, test x$FUSB_TECH = xlibusb1) AM_CONDITIONAL(FUSB_TECH_ra_wb, test x$FUSB_TECH = xra_wb) + + AC_SUBST(USE_LIBUSB1) + AC_CONFIG_FILES([\ + usrp/host/include/usrp/libusb_types.h \ + ]) ]) -- cgit v1.2.3