nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

r8723@Kushana: nickm | 2006-09-06 04:24:54 -0400

Browse Source 
Clean up configure.in spaces, and make it work on Mac OS X again (for me).


svn:r8325
This commit is contained in:
Nick Mathewson 2006-09-06 08:42:12 +00:00
parent 49f9fcd108
commit dffa692d05
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
configure.in
View File

@ -74,7 +74,6 @@ AC_PROG_CC
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_RANLIB AC_PROG_RANLIB
# If WIN32 is defined and non-zero, we are building for win32 # If WIN32 is defined and non-zero, we are building for win32
AC_MSG_CHECKING([for win32]) AC_MSG_CHECKING([for win32])
AC_TRY_COMPILE(, AC_TRY_COMPILE(,
@ -93,7 +92,6 @@ bwin32=true; AC_MSG_RESULT([yes]),
bwin32=false; AC_MSG_RESULT([no]) bwin32=false; AC_MSG_RESULT([no])
) )
if test $bwin32 = true; then if test $bwin32 = true; then
AC_DEFINE(MS_WINDOWS,1, [Define to 1 if we are building for a Windows platform.]) AC_DEFINE(MS_WINDOWS,1, [Define to 1 if we are building for a Windows platform.])
@ -163,13 +161,13 @@ AC_CACHE_CHECK([for libevent directory], ac_cv_libevent_dir, [
le_found=no le_found=no
for ledir in $trylibeventdir "" $prefix /usr/local ; do for ledir in $trylibeventdir "" $prefix /usr/local ; do
LDFLAGS="$saved_LDFLAGS" LDFLAGS="$saved_LDFLAGS"
if test $bwin32 = true; then if test $bwin32 = true; then
LIBS="$saved_LIBS -levent -lws2_32" LIBS="$saved_LIBS -levent -lws2_32"
else else
LIBS="$saved_LIBS -levent" LIBS="$saved_LIBS -levent"
fi fi
# Skip the directory if it isn't there. # Skip the directory if it isn't there.
if test ! -z "$ledir" -a ! -d "$ledir" ; then if test ! -z "$ledir" -a ! -d "$ledir" ; then
continue; continue;
@ -273,13 +271,13 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssl_dir, [
ssl_found=no ssl_found=no
for ssldir in $tryssldir "" $prefix /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /usr/pkg /opt /opt/openssl ; do for ssldir in $tryssldir "" $prefix /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /usr/pkg /opt /opt/openssl ; do
LDFLAGS="$saved_LDFLAGS" LDFLAGS="$saved_LDFLAGS"
if test $bwin32 = true; then if test $bwin32 = true; then
LIBS="$LIBS -lssl -lcrypto -lws2_32 -lgdi32" LIBS="$saved_LIBS -lssl -lcrypto -lws2_32 -lgdi32"
else else
LIBS="$LIBS -lssl -lcrypto" LIBS="$saved_LIBS -lssl -lcrypto"
fi fi
# Skip the directory if it isn't there. # Skip the directory if it isn't there.
if test ! -z "$ssldir" -a ! -d "$ssldir" ; then if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
continue; continue;
@ -410,18 +408,18 @@ dnl The warning message here is no longer strictly accurate.
AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h sys/stat.h sys/types.h fcntl.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h time.h pwd.h grp.h, , AC_MSG_WARN(some headers were not found, compilation may fail)) AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h sys/stat.h sys/types.h fcntl.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h time.h pwd.h grp.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
# if the user doesn't have timeval this will generate a nasty warning. if
# timeval isn't provided, define one
AC_CHECK_HEADERS(event.h, , AC_MSG_ERROR(Libevent header (event.h) not found. Tor requires libevent to build.), AC_CHECK_HEADERS(event.h, , AC_MSG_ERROR(Libevent header (event.h) not found. Tor requires libevent to build.),
[#ifdef HAVE_SYS_TIME_H [#ifdef HAVE_SYS_TYPES_H
#include <sys/time.h> #include <sys/types.h>
#else #endif
struct timeval { #ifdef HAVE_SYS_TIME_H
long tv_sec; #include <sys/time.h>
long tv_usec; #else
} struct timeval {
#endif] long tv_sec;
) long tv_usec;
};
#endif])
AC_CHECK_HEADERS(zlib.h, , AC_MSG_ERROR(Zlib header (zlib.h) not found. Tor requires zlib to build. You may need to install a zlib development package.)) AC_CHECK_HEADERS(zlib.h, , AC_MSG_ERROR(Zlib header (zlib.h) not found. Tor requires zlib to build. You may need to install a zlib development package.))
@ -671,7 +669,6 @@ if test $ac_cv_have_func_macro = 'yes'; then
AC_DEFINE(HAVE_MACRO__func__, 1, [Defined if the compiler supports __func__]) AC_DEFINE(HAVE_MACRO__func__, 1, [Defined if the compiler supports __func__])
fi fi
if test $ac_cv_have_FUNC_macro = 'yes'; then if test $ac_cv_have_FUNC_macro = 'yes'; then
AC_DEFINE(HAVE_MACRO__FUNC__, 1, [Defined if the compiler supports __FUNC__]) AC_DEFINE(HAVE_MACRO__FUNC__, 1, [Defined if the compiler supports __FUNC__])
fi fi
@ -681,7 +678,6 @@ if test $ac_cv_have_FUNCTION_macro = 'yes'; then
[Defined if the compiler supports __FUNCTION__]) [Defined if the compiler supports __FUNCTION__])
fi fi
# $prefix stores the value of the --prefix command line option, or # $prefix stores the value of the --prefix command line option, or
# NONE if the option wasn't set. In the case that it wasn't set, make # NONE if the option wasn't set. In the case that it wasn't set, make
# it be the default, so that we can use it to expand directories now. # it be the default, so that we can use it to expand directories now.