[msgbus commit] r119 - in trunk: . python src

[codesite...@google.com]

Author: jon.oberheide
Date: Fri Mar 7 19:30:43 2008
New Revision: 119

Modified:
trunk/configure.ac
trunk/python/Makefile.am
trunk/python/setup.py
trunk/src/Makefile.am

Log:
build tweaks

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar 7 19:30:43 2008
@@ -8,8 +8,6 @@
AC_HEADER_STDC
AM_PROG_LIBTOOL
AC_CANONICAL_HOST
-
-AC_CHECK_HEADERS(stdio.h signal.h unistd.h math.h time.h sys/types.h)
AC_REPLACE_FUNCS(strlcat strlcpy)

case "$host" in
@@ -23,7 +21,6 @@
LDFLAGS="$LDFLAGS --strip-all"
AC_DEFINE(OS_WIN32, 1, [compiling under windows])
AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, [fast code generation])
- AC_MSG_WARN([You are building under Windows, be sure you are
following README.win32])
;;
*darwin* | *macos10*)
OS="bsd"
@@ -38,7 +35,6 @@
fi
AC_DEFINE(OS_BSD, 1, [compiling under bsd])
AC_DEFINE(BIND_8_COMPAT, 1, [enable bind8 compatibility])
- AC_MSG_WARN([You are building under Darwin/OS X, be sure you are
following README.macosx])
;;
*bsd*)
OS="bsd"
@@ -47,7 +43,6 @@
*)
OS="bsd"
AC_DEFINE(OS_BSD, 1, [compiling under unknown, assuming BSD])
- AC_MSG_WARN([You are using an unsupported OS, assuming BSD])
;;
esac

Modified: trunk/python/Makefile.am
==============================================================================
--- trunk/python/Makefile.am (original)
+++ trunk/python/Makefile.am Fri Mar 7 19:30:43 2008
@@ -1,7 +1,7 @@
noinst_SCRIPTS = python-build

$(srcdir)/evmsg.c: $(srcdir)/evmsg.pyx
- pyrexc $(srcdir)/evmsg.pyx
+ cython $(srcdir)/evmsg.pyx

python-build: $(srcdir)/evmsg.c
python setup.py build

Modified: trunk/python/setup.py
==============================================================================
--- trunk/python/setup.py (original)
+++ trunk/python/setup.py Fri Mar 7 19:30:43 2008
@@ -6,7 +6,7 @@
sources=[ 'evmsg.c' ],
include_dirs=[ '..', '../src' ],
library_dirs=[ '../src/.libs' ],
-
libraries=[ 'event_core', 'event_extra', 'evmsg', 'ssl', 'crypto', 'resolv' ]
+
libraries=[ 'event_core', 'event_extra', 'evmsg', 'ssl', 'crypto' ]
)

setup(name='evmsg',

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Mar 7 19:30:43 2008
@@ -1,15 +1,15 @@
lib_LTLIBRARIES = libevmsg.la

libevmsg_la_SOURCES = evmsg.c
-libevmsg_la_LIBADD = @LTLIBOBJS@ -levent_core -levent_extra -lresolv
+libevmsg_la_LIBADD = @LTLIBOBJS@ -levent_core -levent_extra

bin_PROGRAMS = msgbus test-pub test-sub

msgbus_SOURCES = msgbus.c match.c mimetype.c
-msgbus_LDADD = libevmsg.la -levent_core -levent_extra -lresolv
+msgbus_LDADD = libevmsg.la -levent_core -levent_extra

test_pub_SOURCES = test-pub.c
-test_pub_LDADD = libevmsg.la -levent_core -levent_extra -lresolv
+test_pub_LDADD = libevmsg.la -levent_core -levent_extra

test_sub_SOURCES = test-sub.c
-test_sub_LDADD = libevmsg.la -levent_core -levent_extra -lresolv
+test_sub_LDADD = libevmsg.la -levent_core -levent_extra