done
LIBS=$OLIBS
fi
- CFLAGS=$OCFLAGS
- PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
+ LIBS=$PTHREAD_LIBS
+ CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1"
+ YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1"
])
fi
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
libyaz_la_LIBADD = $(SSL_LIBS)
-libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
libyaz_server_la_LIBADD = libyaz.la
libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
copy_types.c match_glob.c poll.c daemon.c \
iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c \
- json.c xml_include.c file_glob.c dirent.c
+ json.c xml_include.c file_glob.c dirent.c mutex.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
- requestq.c eventl.h session.h mutex.c
+ requestq.c eventl.h session.h
libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
LDADD = ../src/libyaz.la
test_icu_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
-test_mutex_LDADD = ../src/libyaz_server.la ../src/libyaz.la $(PTHREAD_LIBS)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-
CONFIG_CLEAN_FILES=*.log
yaz_echo_comp=no
yaz_src_root=@YAZ_SRC_ROOT@
yaz_build_root=@YAZ_BUILD_ROOT@
-PTHREAD_LIBS="@PTHREAD_LIBS@"
-PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
ICU_LIBS="@ICU_LIBS@"
ICU_CPPFLAGS="@ICU_CPPFLAGS@"
SSL_LIBS="@SSL_LIBS@"
fi
if test "$lib_thread" = "yes"; then
- YAZINC="$PTHREAD_CFLAGS $YAZINC"
- YAZLIB="$YAZLIB $PTHREAD_LIBS"
- YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
+ :
fi
if test "$lib_icu" = "yes"; then
EXTRA_DIST=dummy-words dummy-grs ztest.pem config1.xml
-LDADD=../src/libyaz_server.la ../src/libyaz.la $(PTHREAD_LIBS)
+LDADD=../src/libyaz_server.la ../src/libyaz.la
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)