From 352ed70600fe515f249cc24388b9329cc4e1258b Mon Sep 17 00:00:00 2001 From: Richard Nyberg Date: Wed, 8 Nov 2006 09:01:48 +0000 Subject: [PATCH] Update the build scripts for the following events: o Some new source files. o Inclusion of libevent. o Removal of curl and pthreads dependencies. --- Makefile.am | 2 +- acinclude.m4 | 190 ----------------------------------------------- btpd/Makefile.am | 13 ++-- configure.ac | 41 +--------- misc/Makefile.am | 9 ++- 5 files changed, 13 insertions(+), 242 deletions(-) delete mode 100644 acinclude.m4 diff --git a/Makefile.am b/Makefile.am index 9e2ebe4..85d4bdf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS=misc btpd cli +SUBDIRS=@subdirs@ misc btpd cli EXTRA_DIST=COPYRIGHT CHANGES diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index cd33f21..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,190 +0,0 @@ -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_TRY_LINK([#include ], [int attr=$attr; return attr;], - [attr_name=$attr; break]) - done - AC_MSG_RESULT($attr_name) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with cc_r - AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) -else - PTHREAD_CC="$CC" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff --git a/btpd/Makefile.am b/btpd/Makefile.am index 69a47f1..1f36eb1 100644 --- a/btpd/Makefile.am +++ b/btpd/Makefile.am @@ -4,20 +4,17 @@ btpd_SOURCES=\ btpd.c btpd.h\ cli_if.c content.c content.h\ download.c download_subr.c download.h\ - http.c http.h\ + http_tr_if.c\ main.c\ net.c net.h net_types.h\ net_buf.c net_buf.h\ opts.c opts.h\ peer.c peer.h\ - td.c tlib.c tlib.h torrent.c torrent.h\ + tlib.c tlib.h torrent.c torrent.h\ tracker_req.c tracker_req.h\ upload.c upload.h\ util.c -CC=@PTHREAD_CC@ -CFLAGS=@CFLAGS@ @PTHREAD_CFLAGS@ @curl_CFLAGS@ - -btpd_LDADD=@PTHREAD_LIBS@ ../misc/libmisc.a -levent -lcrypto -lm -btpd_CPPFLAGS=-I$(top_srcdir)/misc @event_CPPFLAGS@ @openssl_CPPFLAGS@ -btpd_LDFLAGS=@event_LDFLAGS@ @openssl_LDFLAGS@ @curl_LDFLAGS@ +btpd_LDADD=../misc/libmisc.a ../libevent/libevent.a +btpd_CPPFLAGS=-I$(top_srcdir)/misc -I$(top_srcdir)/libevent @openssl_CPPFLAGS@ +btpd_LDFLAGS=@openssl_LDFLAGS@ -lcrypto -lm diff --git a/configure.ac b/configure.ac index 915ca7c..aef2fed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(btpd, 0.12, btpd@murmeldjur.se) +AC_INIT(btpd, 0.13, btpd@murmeldjur.se) AM_INIT_AUTOMAKE([foreign]) @@ -10,16 +10,6 @@ AC_PROG_RANLIB CFLAGS="$CFLAGS -std=c99" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" -ACX_PTHREAD([], [echo Must have pthread support; exit 1]) - -AC_ARG_WITH(libevent, -[ --with-libevent=dir use libevent installed in dir], -[ - AC_SUBST(event_LDFLAGS,["-L${withval}/lib -Wl,-rpath=${withval}/lib"]) - AC_SUBST(event_CPPFLAGS,"-I${withval}/include") -], -[]) - AC_ARG_WITH(openssl, [ --with-openssl=dir use openssl installed in dir], [ @@ -28,13 +18,6 @@ AC_ARG_WITH(openssl, ], []) -AC_ARG_WITH(curlconf, -[ --with-curlconf=prog use this curl-config], -[ - CURLCONF=$withval -], -[]) - AC_ARG_WITH(warn, [ --with-warn=level select warning preset (no,all,allerr)], [ @@ -55,31 +38,11 @@ AC_ARG_WITH(warn, ], []) -old_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $event_LDFLAGS" -AC_CHECK_LIB(event, event_init, :, echo Must have libevent; exit 1) -LDFLAGS=$old_LDFLAGS - old_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $openssl_LDFLAGS" AC_CHECK_LIB(crypto, SHA1_Final, :, echo Must have openssl; exit 1) LDFLAGS=$old_LDFLAGS -if test x$CURLCONF = x; then - AC_PATH_PROG(CURLCONF, curl-config) -fi - -if test x$CURLCONF = x -o \! \( -r "$CURLCONF" -a -x "$CURLCONF" \); then - echo Must have the curl-config script - exit 1 -else - AC_SUBST(curl_CFLAGS, `$CURLCONF --cflags`) - AC_SUBST(curl_LDFLAGS, `$CURLCONF --libs`) -fi - -old_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $curl_LDFLAGS" -AC_CHECK_LIB(curl, curl_easy_strerror, :, echo Must have recent curl; exit 1) -LDFLAGS=$old_LDFLAGS +AC_CONFIG_SUBDIRS([libevent]) AC_OUTPUT diff --git a/misc/Makefile.am b/misc/Makefile.am index 66209c3..c0c3844 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -2,10 +2,11 @@ noinst_LIBRARIES=libmisc.a libmisc_a_SOURCES=\ benc.c benc.h\ btpd_if.c btpd_if.h ipcdefs.h\ - stream.c stream.h\ - subr.c subr.h\ metainfo.c metainfo.h\ hashtable.c hashtable.h\ + http_client.c http_client.h\ iobuf.c iobuf.h\ - queue.h -libmisc_a_CPPFLAGS=@openssl_CPPFLAGS@ + queue.h\ + stream.c stream.h\ + subr.c subr.h +libmisc_a_CPPFLAGS=-I$(top_srcdir)/libevent @openssl_CPPFLAGS@