version 1.252, 2009/07/08 07:07:43
|
version 1.253, 2009/08/10 15:16:25
|
Line 761 if test "$with_system_libwww" != "yes" ;
|
Line 761 if test "$with_system_libwww" != "yes" ;
|
--build=$build_alias --host=$host_alias --target=$target_alias \ |
--build=$build_alias --host=$host_alias --target=$target_alias \ |
--disable-shared \ |
--disable-shared \ |
$WITHDAV \ |
$WITHDAV \ |
--with-zlib && \ |
--with-zlib --with-ssl && \ |
echo "libwww is configured" ; \ |
echo "libwww is configured" ; \ |
echo "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \ |
echo "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \ |
cp wwwconf.h wwwconf.h.orig ; \ |
cp wwwconf.h wwwconf.h.orig ; \ |
Line 773 if test "$with_system_libwww" != "yes" ;
|
Line 773 if test "$with_system_libwww" != "yes" ;
|
BUILDLIBWWW="libwww" |
BUILDLIBWWW="libwww" |
LIBWWW_CONFIG="libwww/libwww-config" |
LIBWWW_CONFIG="libwww/libwww-config" |
LIBWWW_LDFLAGS="-L$CURRENT_PATH/libwww/Library/src/.libs -lwwwxml -lwwwzip -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils -lwwwdav \ |
LIBWWW_LDFLAGS="-L$CURRENT_PATH/libwww/Library/src/.libs -lwwwxml -lwwwzip -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils -lwwwdav \ |
|
-L$CURRENT_PATH/libwww/Library/src/SSL/.libs -lwwwssl\ |
-L$CURRENT_PATH/libwww/modules/md5/.libs -lmd5 \ |
-L$CURRENT_PATH/libwww/modules/md5/.libs -lmd5 \ |
-L$CURRENT_PATH/libwww/modules/expat/.libs -lexpat" |
-L$CURRENT_PATH/libwww/modules/expat/.libs -lexpat \ |
LIBWWW_CFLAGS="-I$CURRENT_PATH/../../libwww/Library/src -I$CURRENT_PATH/libwww -I$CURRENT_PATH/../../libwww/modules/lib/expat" |
-L/usr/lib -lssl -lcrypto" |
|
LIBWWW_CFLAGS="-I$CURRENT_PATH/../../libwww/Library/src -I$CURRENT_PATH/libwww -I$CURRENT_PATH/../../libwww/modules/lib/expat -I$CUURENT_PATH/../../libwww/Library/src/SSL" |
else |
else |
LIBWWW_CFLAGS="`$LIBWWW_CONFIG --cflags`" |
LIBWWW_CFLAGS="`$LIBWWW_CONFIG --cflags`" |
LIBWWW_LDFLAGS="`$LIBWWW_CONFIG --libs`" |
LIBWWW_LDFLAGS="`$LIBWWW_CONFIG --libs`" |
Line 1227 if test "$build_amaya" = "yes" ; then
|
Line 1229 if test "$build_amaya" = "yes" ; then
|
if test "$with_system_raptor" = "yes" ; then |
if test "$with_system_raptor" = "yes" ; then |
echo Amaya configured with the RaptorF library \(system\) |
echo Amaya configured with the RaptorF library \(system\) |
else |
else |
echo Amaya configured with the Raptor library \(system\) |
echo Amaya configured with the Raptor library \(local source\) |
fi |
fi |
fi |
fi |
if test "$with_templates" = "yes" ; then |
if test "$with_templates" = "yes" ; then |