diff options
| author | Peter Stuge <peter@stuge.se> | 2012-10-23 00:15:23 +0000 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2012-11-25 00:27:45 +0000 |
| commit | 94b0ccc5e58b854c7e9e38b21efd3d217f0f5353 (patch) | |
| tree | f88ab7b8be51d5ea3ec1b4da0e00dcd2fca45d9d /configure.ac | |
| parent | 5e479f1821d3294fb1cc70c5867c69eca2551de7 (diff) | |
| download | libusb-94b0ccc5e58b854c7e9e38b21efd3d217f0f5353.tar.gz | |
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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index e19803c..1ba6ef5 100644 --- 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) |