libtoolize; from Nick Mathewson

svn:r153

diff --git a/Makefile.am b/Makefile.am
index 376700588683e83367eefa92f464d83140d8cff4..cfdf2e9dabaae6ba3e2374b6e60a7cdcf2435b50 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,11 @@ EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h event.3 \
        WIN32-Prj/signal_test/signal_test.dsp WIN32-Prj/time_test \
        WIN32-Prj/time_test/time_test.dsp
 
-lib_LIBRARIES = libevent.a
+lib_LTLIBRARIES = libevent.la
 
-libevent_a_SOURCES = event.c buffer.c evbuffer.c log.c
-libevent_a_LIBADD = @LIBOBJS@
+libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c
+libevent_la_LIBADD = @LTLIBOBJS@
+libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:2:0
 
 include_HEADERS = event.h
 

diff --git a/configure.in b/configure.in
index 2f0541c2a7bba11e62608158a4fbab0c4e5c0827..4c93224c0c67a0f6a79c086f56bc4be0b16b0464 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,6 @@ fi
 
 dnl Checks for programs.
 AC_PROG_CC
-AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
@@ -22,6 +21,13 @@ if test "$GCC" = yes ; then
         CFLAGS="$CFLAGS -Wall"
 fi
 
+AC_PROG_LIBTOOL
+
+dnl   Uncomment "AC_DISABLE_SHARED" to make shared librraries not get
+dnl   built by default.  You can also turn shared libs on and off from 
+dnl   the command line with --enable-shared and --disable-shared.
+dnl AC_DISABLE_SHARED
+AC_SUBST(LIBTOOL_DEPS)
 
 dnl Check for optional stuff
 AC_ARG_WITH(rtsig,

diff --git a/sample/Makefile.am b/sample/Makefile.am
index 7d12e63c0d929a72fa803bda076842d227d002e3..b749b80656fc77bc04d4095997ae1626abc16a16 100644 (file)
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-LDADD = -L.. -levent
+LDADD = ../libevent.la
 CPPFPLAGS = -I.. 
 CFLAGS = -I../compat
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 28e47784f7aeabeb93f32e7fd1a56b8072555454..0efdd40c166abc479eabbf5addde9659c0398a46 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-LDADD = -L.. -levent
+LDADD = ../libevent.la
 CPPFPLAGS = -I.. 
 CFLAGS = -I../compat @CFLAGS@
 
@@ -20,4 +20,4 @@ test: test-init test-eof test-weof test-time regress
 verify: test
        @./test.sh
 
-bench test-init test-eof test-weof test-time regress: ../libevent.a
+bench test-init test-eof test-weof test-time regress: ../libevent.la