Build correctly for use on OS X platforms with case-sensitive filesystems

svn:r8487
This commit is contained in:
Nick Mathewson 2006-09-24 21:45:02 +00:00
parent bda137501e
commit b1ad605780
3 changed files with 8 additions and 3 deletions

View File

@ -39,6 +39,8 @@ Changes in version 0.1.2.2-alpha - 2006-??-??
instead of "X resolved to X". instead of "X resolved to X".
- Prevent the 'exitlist' script from printing the same result more - Prevent the 'exitlist' script from printing the same result more
than once. than once.
- Build correctly for use on OS X platforms with case-sensitive
filesystems.
o Documentation o Documentation
- Documented (and renamed) ServerDNSSearchDomains and - Documented (and renamed) ServerDNSSearchDomains and

View File

@ -46,6 +46,9 @@ dist-osx:
if [ "x$(sysconfdir)" != 'x/Library' ]; then \ if [ "x$(sysconfdir)" != 'x/Library' ]; then \
echo "Configure with --sysconfdir=/Library, please"; \ echo "Configure with --sysconfdir=/Library, please"; \
exit 1; \ exit 1; \
fi; \
if [ "x$(CONFDIR)" != 'x/Library/Tor' ]; then \
echo "Configure with CONFDIR=/Library/Tor, please"; \
fi fi
$(MAKE) all $(MAKE) all
VERSION=$(VERSION) sh ./contrib/osx/package.sh VERSION=$(VERSION) sh ./contrib/osx/package.sh

View File

@ -716,7 +716,9 @@ if test "x$exec_prefix" = "xNONE"; then
exec_prefix=$prefix exec_prefix=$prefix
fi fi
CONFDIR=`eval echo $sysconfdir/tor` if test "x$CONFDIR" = "x"; then
CONFDIR=`eval echo $sysconfdir/tor`
fi
AC_SUBST(CONFDIR) AC_SUBST(CONFDIR)
AH_TEMPLATE([CONFDIR],[tor's configuration directory]) AH_TEMPLATE([CONFDIR],[tor's configuration directory])
AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR")
@ -742,8 +744,6 @@ fi
# Add these in when you feel like fun. # Add these in when you feel like fun.
#CFLAGS="$CFLAGS -Wbad-function-cast -Werror -Wdeclaration-after-statement -Wold-style-definition" #CFLAGS="$CFLAGS -Wbad-function-cast -Werror -Wdeclaration-after-statement -Wold-style-definition"
echo "confdir: $CONFDIR"
AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh) AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh)
if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then