[or-cvs] remove popt dependency, consolidate config stuff

Roger Dingledine arma at seul.org
Sat Nov 23 06:49:27 UTC 2002


Update of /home/or/cvsroot
In directory moria.seul.org:/home/arma/work/onion/cvs

Modified Files:
	README TODO acconfig.h configure.in 
Log Message:
remove popt dependency, consolidate config stuff
reformat parts of onion.c


Index: TODO
===================================================================
RCS file: /home/or/cvsroot/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TODO	3 Sep 2002 22:53:31 -0000	1.5
+++ TODO	23 Nov 2002 06:48:55 -0000	1.6
@@ -1,4 +1,3 @@
-
 [First four are all equally first.
 Others follow in order of priority.]
 
@@ -34,7 +33,7 @@
 debian / red hat spec file
 handle starting things as a system daemon
 transition addr to sin_addr
-
+get proxy to choose the same conn if it's open
 
 Obvious things I'd like to do that won't break anything:
 

Index: acconfig.h
===================================================================
RCS file: /home/or/cvsroot/acconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- acconfig.h	29 Jun 2002 02:21:09 -0000	1.1
+++ acconfig.h	23 Nov 2002 06:48:55 -0000	1.2
@@ -1,3 +1,2 @@
-#undef HAVE_POPT
 #undef HAVE_OPENSSL
 

Index: configure.in
===================================================================
RCS file: /home/or/cvsroot/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.in	22 Sep 2002 11:09:03 -0000	1.9
+++ configure.in	23 Nov 2002 06:48:55 -0000	1.10
@@ -16,14 +16,6 @@
 AC_PROG_RANLIB
 
 dnl AC_DEFINE([HAVE_OPENSSL], 0, [Define if OpenSSL was found.])
-dnl AC_DEFINE([HAVE_POPT], 0, [Define if popt was found.])
-
-AC_CHECK_LIB(popt,poptParseArgvString,
-	AC_DEFINE(HAVE_POPT),
-	AC_MSG_ERROR(required library not found: popt)
-)
-
-LIBS="$LIBS -lpopt"
 
 # The big search for OpenSSL
 # copied from openssh's configure.ac



More information about the tor-commits mailing list