diff options
Diffstat (limited to 'drivers/staging/usbip/userspace/configure.ac')
-rw-r--r-- | drivers/staging/usbip/userspace/configure.ac | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac index e3afa159116a..bf5cf49cb554 100644 --- a/drivers/staging/usbip/userspace/configure.ac +++ b/drivers/staging/usbip/userspace/configure.ac @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([usbip], [0.1.8], [usbip-devel@lists.sourceforge.net]) -AC_DEFINE([USBIP_VERSION], [0x000106], [numeric version number]) +AC_INIT([usbip-utils], [1.1.1], [linux-usb@vger.kernel.org]) +AC_DEFINE([USBIP_VERSION], [0x00000111], [binary-coded decimal version number]) CURRENT=0 REVISION=1 @@ -29,7 +29,7 @@ AC_PROG_MAKE_SET AC_HEADER_DIRENT AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h dnl - string.h strings.h sys/socket.h syslog.h unistd.h]) + string.h sys/socket.h syslog.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_INT32_T @@ -41,7 +41,7 @@ AC_TYPE_UINT8_T # Checks for library functions. AC_FUNC_REALLOC -AC_CHECK_FUNCS([bzero memset mkdir regcomp socket strchr strerror strstr dnl +AC_CHECK_FUNCS([memset mkdir regcomp socket strchr strerror strstr dnl strtoul]) AC_CHECK_HEADER([sysfs/libsysfs.h], @@ -85,26 +85,12 @@ AC_ARG_WITH([tcp-wrappers], [AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])]) # Sets directory containing usb.ids. -USBIDS_DIR='${datadir}/usbip' AC_ARG_WITH([usbids-dir], [AS_HELP_STRING([--with-usbids-dir=DIR], - [where usb.ids is found (default ${datadir}/usbip)])], - [USBIDS_DIR=$withval]) + [where usb.ids is found (default /usr/share/hwdata/)])], + [USBIDS_DIR=$withval], [USBIDS_DIR="/usr/share/hwdata/"]) AC_SUBST([USBIDS_DIR]) -dnl FIXME: when disabled, empty directry is created -usbids=install -AC_ARG_ENABLE([usbids-install], - [AS_HELP_STRING([--enable-usbids-install], - [install usb.ids (default)])], - [AS_CASE([$enableval], - [yes], [usbids=install], - [no], [usbids=notinstall], - [AC_MSG_ERROR( - [bad value ${enableval} for --enable-usbids-install])] - )]) -AM_CONDITIONAL([INSTALL_USBIDS], [test x$usbids = xinstall]) - GLIB2_REQUIRED=2.6.0 PKG_CHECK_MODULES([PACKAGE], [glib-2.0 >= $GLIB2_REQUIRED]) AC_SUBST([PACKAGE_CFLAGS]) |