Skip to content

Commit f59ca95

Browse files
dgrove-ossdas
authored andcommitted
Fix typo in configure.ac impacting libpwq configuration
Fix a typo in configure.ac that resulted in improper configuration when libpwq was not present (for example when the git submodule init is not performed). Problem report on swift-users list. Fix related typos in Makefile.am (start if in column 0). Signed-off-by: Daniel A. Steffen <[email protected]>
1 parent e1bc8c3 commit f59ca95

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ AS_IF([test -f $srcdir/libpwq/configure.ac],
187187
[AC_DEFINE(BUILD_OWN_PTHREAD_WORKQUEUES, 1, [Define if building pthread work queues from source])
188188
ac_configure_args="--disable-libpwq-install $ac_configure_args"
189189
AC_CONFIG_SUBDIRS([libpwq])
190-
build_own_pthread_workqueue=true,
190+
build_own_pthread_workqueues=true,
191191
AC_DEFINE(HAVE_PTHREAD_WORKQUEUES, 1, [Define if pthread work queues are present])
192192
have_pthread_workqueues=true],
193-
[build_own_pthread_workqueue=false
193+
[build_own_pthread_workqueues=false
194194
AC_CHECK_HEADERS([pthread/workqueue_private.h pthread_workqueue.h],
195195
[AC_DEFINE(HAVE_PTHREAD_WORKQUEUES, 1, [Define if pthread work queues are present])
196196
have_pthread_workqueues=true],

src/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ if BUILD_OWN_PTHREAD_WORKQUEUES
6868
PTHREAD_WORKQUEUE_LIBS=$(top_builddir)/libpwq/libpthread_workqueue.la
6969
PTHREAD_WORKQUEUE_CFLAGS=-I$(top_srcdir)/libpwq/include
7070
else
71-
if HAVE_PTHREAD_WORKQUEUES
72-
PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
73-
endif
71+
if HAVE_PTHREAD_WORKQUEUES
72+
PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
73+
endif
7474
endif
7575

7676
libdispatch_la_LDFLAGS=-avoid-version

0 commit comments

Comments
 (0)