diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-03-10 13:19:38 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-03-10 13:19:38 +0000 |
| commit | ea78e1ce73c018eff041555ab41448fc889ce278 (patch) | |
| tree | 44e7f8b5448b5310b83c2e6abc3cc5fd2cc85b64 /configure.ac | |
| parent | fae9c17bd2405813d44186c94367d6e66d3994e6 (diff) | |
| download | libusb-ea78e1ce73c018eff041555ab41448fc889ce278.tar.gz | |
merge up to r202c191
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 8d3ba9d..a0abae3 100644 --- a/configure.ac +++ b/configure.ac @@ -43,17 +43,19 @@ case $host in threads="windows" LIBS="-lsetupapi -lole32" AM_CFLAGS="-Wshadow" - AM_LDFLAGS="-no-undefined" + AM_LDFLAGS="-no-undefined -avoid-version" + AC_CHECK_TOOL(RC, windres, no) ;; *-cygwin*) AC_DEFINE(OS_WINDOWS, [], [Windows backend]) AC_SUBST(OS_WINDOWS) AC_MSG_RESULT([Windows]) backend="windows" - threads="posix" + threads="posix" LIBS="-lpthread -lsetupapi -lole32" AM_CFLAGS="" - AM_LDFLAGS="-no-undefined" + AM_LDFLAGS="-no-undefined -avoid-version" + AC_CHECK_TOOL(RC, windres, no) ;; *) AC_MSG_ERROR([unsupported operating system]) @@ -64,14 +66,6 @@ AM_CONDITIONAL([OS_DARWIN], [test "x$backend" == "xdarwin"]) AM_CONDITIONAL([OS_WINDOWS], [test "x$backend" == "xwindows"]) AM_CONDITIONAL([POSIX_THREADS], [test "x$threads" == "xposix"]) -# Library versioning -lt_major="0" -lt_revision="0" -lt_age="0" -AC_SUBST(lt_major) -AC_SUBST(lt_revision) -AC_SUBST(lt_age) - # timerfd AC_CHECK_HEADER([sys/timerfd.h], [timerfd_h=1], [timerfd_h=0]) AC_ARG_ENABLE([timerfd], |