r12607@catbus: nickm | 2007-04-30 21:36:28 -0400

 More attempt to fix win32 building.  This time, with extra linking.

svn:r10080

diff --git a/configure.in b/configure.in
index 209c14e6dfe636111af4c2f9caedbb857e1b9c39..da7015dc738d72266d765608a4bd7e9dc2677607 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -163,12 +163,14 @@ dnl ------------------------------------------------------
 dnl Where do you live, libevent?  And how do we call you?
 
 if test $bwin32 = true; then
-  WS32lib=-lws2_32
-  GDIlib=-lgdi32
+  TOR_LIB_WS32=-lws2_32
+  TOR_LIB_GDI=-lgdi32
 else
-  W32lib=
-  GDIlib=
+  TOR_LIB_WS32=
+  TOR_LIB_GDI=
 fi
+AC_SUBST(TOR_LIB_WS32)
+AC_SUBST(TOR_LIB_GDI)
 
 dnl This is a disgusting hack so we safely include recent libevent headers.
 AC_CHECK_TYPE(u_int64_t, unsigned long long)
@@ -176,20 +178,12 @@ AC_CHECK_TYPE(u_int32_t, unsigned long)
 AC_CHECK_TYPE(u_int16_t, unsigned short)
 AC_CHECK_TYPE(u_int8_t, unsigned char)
 
-if test $bwin32 = true; then
-  WS32lib=-lws2_32
-  GDIlib=-lgdi32
-else
-  W32lib=
-  GDIlib=
-fi
-
 tor_libevent_pkg_redhat="libevent"
 tor_libevent_pkg_debian="libevent"
 tor_libevent_devpkg_redhat="libevent-devel"
 tor_libevent_devpkg_debian="libevent-dev"
 
-TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $WS32lib], [
+TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -213,7 +207,7 @@ tor_openssl_pkg_debian="libssl"
 tor_openssl_devpkg_redhat="openssl-devel"
 tor_openssl_devpkg_debian="libssl-dev"
 
-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $GDIlib],
+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
     [#include <openssl/rand.h>],
     [void RAND_add(const void *buf, int num, double entropy);],
     [RAND_add((void*)0,0,0); exit(0);], [--with-ssl-dir],

diff --git a/src/common/log.c b/src/common/log.c
index 7e6bcffec51f880994356a4150d55defaf69c40f..cb9f0fc7fb4a08086522f8687137e835bd62e8af 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -652,6 +652,7 @@ configure_libevent_logging(void)
 void
 suppress_libevent_log_msg(const char *msg)
 {
+  (void)msg;
 }
 #endif
 

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 93f9edb198cd720e6f7d8e6bb7c9d92c7322a19c..4d4186d966505b9eab3a5a2e05ac213a72045bcc 100644 (file)
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -13,9 +13,8 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \
        eventdns.c \
        tor_main.c
 
-tor_LIBS = -lz -levent -lssl -lcrypto
 tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ \
-        -lz -levent -lssl -lcrypto
+        -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
 tor_LDADD = ../common/libor.a ../common/libor-crypto.a
 
 test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
@@ -28,7 +27,8 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
        test.c
 
 test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-        @TOR_LDFLAGS_libevent@ -lz -levent -lssl -lcrypto
+        @TOR_LDFLAGS_libevent@ -lz -levent -lssl -lcrypto \
+        @TOR_LIB_WS32@ @TOR_LIB_GDI@
 test_LDADD = ../common/libor.a ../common/libor-crypto.a
 
 noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
@@ -36,7 +36,7 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
 tor_main.o: micro-revision.i
 
 micro-revision.i: FORCE
-       @if test -d ../../.svn ; then                           \
+       @if test -d ../../.svn -a x`which svn` != x ; then      \
          svn info ../.. |                                      \
          sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.i \
             || true;                                           \

diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index ca801550e43d2ad42408f79f96a19228ffc47520..6d256a54a69db6b0fa3347eb33037fd8f28831dd 100644 (file)
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,10 +1,11 @@
 bin_PROGRAMS = tor-resolve tor-gencert
 
 tor_resolve_SOURCES = tor-resolve.c
-tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -levent
+tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -levent @TOR_LIB_WS32@
 tor_resolve_LDADD = ../common/libor.a
 
 tor_gencert_SOURCES = tor-gencert.c
 tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-        @TOR_LDFLAGS_libevent@ -lz -lcrypto -levent
+        @TOR_LDFLAGS_libevent@ -lz -lcrypto -levent \
+        @TOR_LIB_WS32@ @TOR_LIB_GDI@
 tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a