Skip to content

Commit

Permalink
Explicit link to libpthread has been eliminated.
Browse files Browse the repository at this point in the history
  • Loading branch information
fukuchi committed Apr 9, 2012
1 parent eb7ef02 commit d511233
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* Following fixes have been contributed by Yutaka Niibe.
* qrencode.1.in:
- "Hyphen-used-as-minus-sign" error has been fixed.
* configure.ac, libqrencode.pc.in, tests/Makefile.am:
- Explicit link to libpthread has been eliminated.

2012.04.01 Kentaro FUKUCHI <[email protected]>
[3.3]
Expand Down
21 changes: 11 additions & 10 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,14 @@ countries.
Reed-Solomon encoder is written by Phil Karn, KA9Q.
Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q

NANKI Haruo - improved lower-case characteres encoding
Philippe Delcroix - improved mask evaluation
Yusuke Mihara - structured-append support
David Dahl - DPI patch
Adam Shepherd - bug fix patch of the mask evaluation
Josef Eisl (zapster) - EPS support patch
Colin (moshen) - ANSI support patch
Ralf Ertzinger - ASCII support patch
Shigeyuki Hirai, Paul Janssens, wangsai, Gavan Fantom, Yutaka Niibe (gniibe),
Matthew Baker - bug report / suggestion
NANKI Haruo - improved lower-case characteres encoding
Philippe Delcroix - improved mask evaluation
Yusuke Mihara - structured-append support
David Dahl - DPI patch
Adam Shepherd - bug fix patch of the mask evaluation
Josef Eisl (zapster) - EPS support patch
Colin (moshen) - ANSI support patch
Ralf Ertzinger - ASCII support patch
Yutaka Niibe (gniibe) - various bug fix patches
Shigeyuki Hirai, Paul Janssens, wangsai, Gavan Fantom, Matthew Baker
- bug report / suggestion
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AC_ARG_ENABLE([thread-safety], [AS_HELP_STRING([--enable-thread-safety], [make t
[], [enable_thread_safety=yes])

if test x$enable_thread_safety = xyes; then
AC_CHECK_LIB([pthread], [pthread_mutex_init])
AC_CHECK_LIB([pthread], [pthread_mutex_init], [AC_SUBST([LIBPTHREAD], [-lpthread])])
fi
AM_CONDITIONAL([HAVE_LIBPTHREAD], [test "x$ac_cv_lib_pthread_pthread_mutex_init" = "xyes" ])

Expand Down
3 changes: 2 additions & 1 deletion libqrencode.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ includedir=@includedir@
Name: libqrencode
Description: A QR Code encoding library
Version: @VERSION@
Libs: -L${libdir} -lqrencode @LIBS@
Libs: -L${libdir} -lqrencode
Libs.private: @LIBPTHREAD@
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ prof_qrencode_SOURCES = prof_qrencode.c
prof_qrencode_LDADD = ../libqrencode.la

pthread_qrencode_SOURCES = pthread_qrencode.c
pthread_qrencode_LDADD = ../libqrencode.la
pthread_qrencode_LDADD = ../libqrencode.la $(LIBPTHREAD)

create_frame_pattern_SOURCES = create_frame_pattern.c
create_frame_pattern_CFLAGS = $(png_CFLAGS)
Expand Down

0 comments on commit d511233

Please sign in to comment.