version 1.223, 2007/04/25 09:44:44
|
version 1.224, 2007/06/05 16:22:06
|
Line 1091 fi
|
Line 1091 fi
|
if test "$with_redland" = "yes" ; then |
if test "$with_redland" = "yes" ; then |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND" |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND" |
if test "$with_system_redland" != "yes" ; then |
if test "$with_system_redland" != "yes" ; then |
|
AMAYA_RAPTOR_SRC="amaya_comp_redland" |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor " |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor " |
AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a" |
AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a" |
AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor" |
AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor" |
BUILDREDLAND="redland" |
|
CURRENTPATH="`pwd`" |
|
mkdir $BUILDREDLAND |
|
cd $BUILDREDLAND && |
|
CC="$CC" CXX="$CXX" \ |
|
CPPFLAGS="-I$CURRENTPATH/../../libwww/modules/expat/lib" \ |
|
LDFLAGS="-L$CURRENTPATH/libwww/modules/expat -L$CURRENTPATH/libwww/modules/expat/.libs" \ |
|
../../../redland/configure \ |
|
--build=$build_alias --host=$host_alias --target=$target_alias \ |
|
--disable-shared \ |
|
--without-bdb \ |
|
--enable-parsers=raptor \ |
|
--with-raptor=internal \ |
|
--with-xml-parser=expat \ |
|
--with-www=none \ |
|
--without-libwww \ |
|
--without-openssl-digests \ |
|
--without-mysql |
|
$ECHO "redland is configured" |
|
$ECHO "Patching the raptor_config.h file to avoid including glib2-0" |
|
$CP raptor/raptor_config.h raptor/raptor_config.h.orig |
|
$SED "s/\(\#define HAVE_G_UTF8_NORMALIZE 1\)/\/* \1 *\//" \ |
|
raptor/raptor_config.h.orig > raptor/raptor_config.h |
|
$RM raptor/raptor_config.h.orig |
|
$ECHO "Raptor is patched" |
|
cd .. |
|
else |
else |
|
MAKEREDLAND=['#'] |
|
AMAYA_RAPTOR_SRC= |
redland_includes=`$REDLAND_CONFIG --cflags` |
redland_includes=`$REDLAND_CONFIG --cflags` |
redland_libs=`$REDLAND_CONFIG --libs` |
redland_libs=`$REDLAND_CONFIG --libs` |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS" |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS" |
Line 1134 fi
|
Line 1111 fi
|
|
|
ANNOTLIB_COMPILE_BM=['#'] |
ANNOTLIB_COMPILE_BM=['#'] |
|
|
AC_SUBST(BUILDREDLAND) |
|
|
|
###################End of Annotations Support#################### |
###################End of Annotations Support#################### |
|
|
|
|
Line 1350 AC_SUBST(LIBDAV)
|
Line 1325 AC_SUBST(LIBDAV)
|
AC_SUBST(WITHDAV) |
AC_SUBST(WITHDAV) |
AC_SUBST(WWWDAV) |
AC_SUBST(WWWDAV) |
|
|
AC_SUBST(ANNOTLIB_COMPILE_BM) |
|
AC_SUBST(AMAYA_RAPTOR_LIBS) |
|
AC_SUBST(AMAYA_RAPTOR_INCLUDES) |
|
AC_SUBST(MAKE_LIBWWW_RDF_PARSER) |
AC_SUBST(MAKE_LIBWWW_RDF_PARSER) |
AC_SUBST(LIBWWW_RDF_PARSER) |
AC_SUBST(LIBWWW_RDF_PARSER) |
|
AC_SUBST(MAKEREDLAND) |
|
#AC_SUBST(ANNOTLIB_COMPILE_BM) |
|
AC_SUBST(AMAYA_RAPTOR_SRC) |
|
AC_SUBST(AMAYA_RAPTOR_LIBS) |
|
AC_SUBST(AMAYA_RAPTOR_INCLUDES) |
|
|
AC_SUBST(SUBDIRS) |
AC_SUBST(SUBDIRS) |
|
|