Merge pull request swiftlang#63 from dgrove-oss/bugfix-libpwq-configure

Fix typo in configure.ac impacting libpwq configuration

Author: MadCoder

configure.ac

@@ -187,10 +187,10 @@ AS_IF([test -f $srcdir/libpwq/configure.ac],
   [AC_DEFINE(BUILD_OWN_PTHREAD_WORKQUEUES, 1, [Define if building pthread work queues from source])
    ac_configure_args="--disable-libpwq-install $ac_configure_args"
    AC_CONFIG_SUBDIRS([libpwq])
-   build_own_pthread_workqueue=true,
+   build_own_pthread_workqueues=true,
    AC_DEFINE(HAVE_PTHREAD_WORKQUEUES, 1, [Define if pthread work queues are present])
    have_pthread_workqueues=true],
-  [build_own_pthread_workqueue=false
+  [build_own_pthread_workqueues=false
    AC_CHECK_HEADERS([pthread/workqueue_private.h pthread_workqueue.h],
      [AC_DEFINE(HAVE_PTHREAD_WORKQUEUES, 1, [Define if pthread work queues are present])
       have_pthread_workqueues=true],

src/Makefile.am

@@ -68,9 +68,9 @@ if BUILD_OWN_PTHREAD_WORKQUEUES
   PTHREAD_WORKQUEUE_LIBS=$(top_builddir)/libpwq/libpthread_workqueue.la
   PTHREAD_WORKQUEUE_CFLAGS=-I$(top_srcdir)/libpwq/include
 else
-  if HAVE_PTHREAD_WORKQUEUES
-    PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
-  endif
+if HAVE_PTHREAD_WORKQUEUES
+  PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
+endif
 endif
 
 libdispatch_la_LDFLAGS=-avoid-version

tests/Makefile.am

@@ -116,9 +116,9 @@ AM_CXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS) $(BSD_OVERLAY_CFLAGS)
 AM_OBJCXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS)
 
 if !BUILD_OWN_PTHREAD_WORKQUEUES
-  if HAVE_PTHREAD_WORKQUEUES
-    PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
-  endif
+if HAVE_PTHREAD_WORKQUEUES
+  PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
+endif
 endif
 
 LDADD=libbsdtests.la $(top_builddir)/src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)