Autotools: Carry over 2012.10.23 libusb changes

* Use LIBS instead of PC_LIBS_PRIVATE
* Move THREAD_CFLAGS & VISIBILITY_CFLAGS into AM_CFLAGS
* Use AC_SEARCH_LIBS(clock_gettime) for pthreads on Linux

diff --git a/configure.ac b/configure.ac
index e19803c..1ba6ef5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,16 +87,16 @@ case $backend in
 linux)
        AC_DEFINE(OS_LINUX, 1, [Linux backend])
        AC_SUBST(OS_LINUX)
-       AC_CHECK_LIB(rt, clock_gettime, PC_LIBS_PRIVATE="-lrt")
+       AC_SEARCH_LIBS(clock_gettime, rt, [], [], -pthread)
        THREAD_CFLAGS="-pthread"
-       PC_LIBS_PRIVATE="${PC_LIBS_PRIVATE} -pthread"
+       LIBS="${LIBS} -pthread"
        AC_CHECK_HEADERS([poll.h])
        AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
        ;;
 darwin)
        AC_DEFINE(OS_DARWIN, 1, [Darwin backend])
        AC_SUBST(OS_DARWIN)
-       PC_LIBS_PRIVATE="-lobjc -Wl,-framework,IOKit -Wl,-framework,CoreFoundation"
+       LIBS="-lobjc -Wl,-framework,IOKit -Wl,-framework,CoreFoundation"
        LTLDFLAGS="${LTLDFLAGS} -Wl,-prebind"
        AC_CHECK_HEADERS([poll.h])
        AC_CHECK_TYPE([nfds_t],
@@ -108,22 +108,20 @@ bsd)
        AC_DEFINE(OS_OPENBSD, 1, [OpenBSD/NetBSD backend])
        AC_SUBST(OS_OPENBSD)
        THREAD_CFLAGS="-pthread"
-       PC_LIBS_PRIVATE="-pthread"
+       LIBS="-pthread"
        AC_CHECK_HEADERS([poll.h])
        AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
        ;;
 windows)
        AC_DEFINE(OS_WINDOWS, 1, [Windows backend])
        AC_SUBST(OS_WINDOWS)
-       PC_LIBS_PRIVATE=""
+       LIBS=""
        LTLDFLAGS="${LTLDFLAGS} -avoid-version -Wl,--add-stdcall-alias"
        AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument])
        ;;
 esac
 
-AC_SUBST(THREAD_CFLAGS)
-AC_SUBST(PC_LIBS_PRIVATE)
-LIBS="${LIBS} ${PC_LIBS_PRIVATE}"
+AC_SUBST(LIBS)
 
 AM_CONDITIONAL(OS_LINUX, test "x$backend" = xlinux)
 AM_CONDITIONAL(OS_DARWIN, test "x$backend" = xdarwin)
@@ -215,9 +213,8 @@ AM_CONDITIONAL([HAVE_SIGACTION], [test "x$have_sigaction" = "xyes"])
 AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_FUNCS(gettimeofday)
 
-AM_CFLAGS="${AM_CFLAGS} -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow"
+AM_CFLAGS="${AM_CFLAGS} -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow ${THREAD_CFLAGS} ${VISIBILITY_CFLAGS}"
 
-AC_SUBST(VISIBILITY_CFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(LTLDFLAGS)
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 02fa1d5..a28a300 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,7 +9,7 @@ endif
 
 if THREADS_POSIX
 if HAVE_SIGACTION
-dpfp_threaded_CFLAGS = $(THREAD_CFLAGS) $(AM_CFLAGS)
+dpfp_threaded_CFLAGS = $(AM_CFLAGS)
 noinst_PROGRAMS += dpfp_threaded
 endif
 endif

diff --git a/libusb-1.0.pc.in b/libusb-1.0.pc.in
index 8e403b8..7bc33c1 100644 (file)
--- a/libusb-1.0.pc.in
+++ b/libusb-1.0.pc.in
@@ -7,5 +7,5 @@ Name: libusbx-1.0
 Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace
 Version: @VERSION@
 Libs: -L${libdir} -lusb-1.0
-Libs.private: @PC_LIBS_PRIVATE@
+Libs.private: @LIBS@
 Cflags: -I${includedir}/libusb-1.0

diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index 44d3efe..53fba6e 100644 (file)
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -45,7 +45,7 @@ else
 THREADS_SRC = os/threads_windows.h os/threads_windows.c
 endif
 
-libusb_1_0_la_CFLAGS = $(VISIBILITY_CFLAGS) $(AM_CFLAGS) $(THREAD_CFLAGS)
+libusb_1_0_la_CFLAGS = $(AM_CFLAGS)
 libusb_1_0_la_LDFLAGS = $(LTLDFLAGS)
 libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) \
        os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h \

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 6c90c70..47abca7 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10587
+#define LIBUSB_NANO 10588