---
Makefile.am | 16 +++++++++-------
configure.ac | 8 ++++----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c9abe0d..0a0029f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ src_pacrunner_SOURCES = $(gdbus_sources) $(builtin_sources) \
src/client.c src/manager.c src/proxy.c \
src/manual.c src/js.h src/js.c src/javascript.h
-src_pacrunner_LDADD = $(builtin_libadd) @GLIB_LIBS@ @GTHREAD_LIBS@ \
+src_pacrunner_LDADD = $(builtin_libadd) @GLIB_LIBS@ @PTHREAD_LIBS@ \
@DBUS_LIBS@ -ldl
src_pacrunner_LDFLAGS = -Wl,--export-dynamic
@@ -85,6 +85,8 @@ tools_proxy_SOURCES = tools/proxy.c
tools_proxy_LDADD = libproxy/libproxy.la
+tools_manual_proxy_test_LDADD = @GLIB_LIBS@
+
tools_manual_proxy_test_SOURCES = tools/manual-proxy-test.c
endif
@@ -110,7 +112,7 @@ endif
if MOZJS
unit_test_pacrunner_SOURCES += plugins/mozjs.c
-unit_test_pacrunner_LDADD += @MOZJS_LIBS@
+unit_test_pacrunner_LDADD += @MOZJS_LIBS@ @PTHREAD_LIBS@
noinst_PROGRAMS += unit/test-mozjs
@@ -118,7 +120,7 @@ unit_test_mozjs_SOURCES = unit/test-mozjs.c src/pacrunner.h
\
src/proxy.c src/manual.c src/download.c \
src/js.c plugins/mozjs.c
-unit_test_mozjs_LDADD = @MOZJS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@
+unit_test_mozjs_LDADD = @MOZJS_LIBS@ @GLIB_LIBS@ @PTHREAD_LIBS@
endif
if V8
@@ -131,10 +133,10 @@ endif
endif #UNIT
-AM_CFLAGS = @GLIB_CFLAGS@ @GTHREAD_LIBS@ @DBUS_CFLAGS@ \
- $(builtin_cflags) \
- -DPACRUNNER_PLUGIN_BUILTIN \
- -DPLUGINDIR=\""$(plugindir)"\"
+AM_CFLAGS = @GLIB_CFLAGS@ @PTHREAD_LIBS@ @DBUS_CFLAGS@ \
+ $(builtin_cflags) \
+ -DPACRUNNER_PLUGIN_BUILTIN \
+ -DPLUGINDIR=\""$(plugindir)"\"
AM_CXXFLAGS = $(AM_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 38d9c44..940aca7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,10 +120,10 @@ else
fi
AC_SUBST(DBUS_DATADIR)
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
- AC_MSG_ERROR(GThread >= 2.16 is required))
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
+AC_CHECK_LIB(pthread, pthread_create,
+ [PTHREAD_LIBS="-lpthread"],
+ [AC_MSG_ERROR([Pthread support is missing])])
+AC_SUBST(PTHREAD_LIBS)
AC_ARG_ENABLE(curl, AC_HELP_STRING([--enable-curl],
[enable CURL plugin support]), [enable_curl=${enableval}])
--
1.8.1.1
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
