Changeset 14660

Timestamp:

Jan 4, 2016, 7:14:38 PM (7 years ago)

Author:

mikedld

Message:

#5663: Autotools fixes: proper kqueue check, macro definitions

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• libtransmission/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -220 +220 @@
 AC_ARG_WITH([kqueue],
             [AS_HELP_STRING([--with-kqueue],[Enable kqueue support (default=auto)])],
-            [WITH_KQUEUE=${withval}],
-            [WITH_KQUEUE=auto])
+            [WANT_KQUEUE=${withval}],
+            [WANT_KQUEUE=auto])
 HAVE_KQUEUE=0
-AS_IF([test "x$WITH_KQUEUE" != "xno"],
+AS_IF([test "x$WANT_KQUEUE" != "xno"],
       [AC_CHECK_HEADER([sys/event.h],
                        [AC_CHECK_FUNC([kqueue],
@@ -229 +229 @@
                        [AS_IF([test "x$WANT_KQUEUE" = "xyes"],
                               [AC_MSG_ERROR("kqueue not found!")])])])
-AM_CONDITIONAL([USE_KQUEUE], [test "x$WITH_KQUEUE" != "xno" -a $HAVE_KQUEUE -eq 1])
+AM_CONDITIONAL([USE_KQUEUE], [test "x$WANT_KQUEUE" != "xno" -a $HAVE_KQUEUE -eq 1])
 
 

trunk/libtransmission/Makefile.am

@@ -81 +81 @@
 if USE_INOTIFY
 libtransmission_a_SOURCES += watchdir-inotify.c
+AM_CPPFLAGS += -DWITH_INOTIFY
 endif
 
 if USE_KQUEUE
 libtransmission_a_SOURCES += watchdir-kqueue.c
+AM_CPPFLAGS += -DWITH_KQUEUE
 endif