[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [Public] / Amaya

Diff for /Amaya/configure.in between versions 1.236 and 1.237

version 1.236, 2008/04/30 15:12:06 version 1.237, 2008/05/27 07:10:35
Line 708  AC_ARG_ENABLE([annot], Line 708  AC_ARG_ENABLE([annot],
         [with_annot="yes"])          [with_annot="yes"])
   
   
 #annot need Redland  #annot need Raptor
 if test "$with_annot" = "yes" ; then  if test "$with_annot" = "yes" ; then
         with_redland="yes"          with_raptor="yes"
 else  else
         with_redland="no"          with_raptor="no"
 fi  fi
   
 AC_ARG_ENABLE([system-redland],  AC_ARG_ENABLE([system-raptor],
         AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),          AC_HELP_STRING([--enable-system-raptor],[try the raptor RDF system library]),
         [case "${enableval}" in          [case "${enableval}" in
           yes) with_system_redland="yes";;            yes) with_system_raptor="yes";;
           no)  with_system_redland="no" ;;            no)  with_system_raptor="no" ;;
           *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;            *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-raptor) ;;
         esac],          esac],
         [with_system_redland="no"])          [with_system_raptor="no"])
   
 #If Redland is needed and we are asked  #If Raptor is needed and we are asked
 #to use the system library, check if is present  #to use the system library, check if is present
 if test "$with_redland" = "yes" -a "$with_system_redland" = "yes" ; then  if test "$with_raptor" = "yes" -a "$with_system_raptor" = "yes" ; then
     # check to see if we have a redland library      # check to see if we have a raptor library
     AC_PATH_PROG([REDLAND_CONFIG],[redland-config])      AC_PATH_PROG([RAPTOR_CONFIG],[raptor-config])
   
     if test "$REDLAND_CONFIG" = "" ; then      if test "$RAPTOR_CONFIG" = "" ; then
         AC_MSG_WARN(Not using system-provided redland library)          AC_MSG_WARN(Not using system-provided Raptor library)
         with_system_redland="no"          with_system_raptor="no"
     else  
   
         AC_MSG_CHECKING(system redland version)  
         redland_min_version=0.9.16  
         REDLAND_VERSION=`$REDLAND_CONFIG --version`  
         redland_version_dec=`echo $REDLAND_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`  
         redland_min_version_dec=`echo $redland_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`  
         if test $redland_version_dec -lt $redland_min_version_dec; then  
                 AC_MSG_RESULT(no - found version $REDLAND_VERSION and minimal version is $redland_min_version)  
                 with_system_redland="no"  
         else  
                 AC_MSG_RESULT(yes - found version $REDLAND_VERSION)  
                 AC_MSG_CHECKING(checking for redland headers)  
                 dnl  We should use awk here and remove the -I from the following line  
                 dnl REDLAND_HEADERS=`$REDLAND_CONFIG --cflags`  
                 REDLAND_HEADERS=""  
                 if test -e "/usr/include/redland.h" ; then  
                         REDLAND_HEADERS="/usr/include";  
                 elif test -e "/usr/local/include/redland.h" ; then  
                         REDLAND_HEADERS="/usr/local/include";  
                 fi  
                 if test $REDLAND_HEADERS != ""; then  
                         AC_MSG_RESULT(yes - have development version)  
                 else  
                         AC_MSG_RESULT(no - no development version)  
                         with_system_redland="no"  
                 fi  
         fi  
     fi      fi
 fi  fi
   
 #if we use the builtin library,  #if we use the builtin library,
 #check it is present  #check it is present
 if test "$with_redland" = "yes" -a "$with_system_redland" != "yes" \  if test "$with_raptor" = "yes" -a "$with_system_raptor" != "yes" \
         -a ! -d "$srcdir/../redland" ; then          -a ! -d "$srcdir/../redland/raptor" ; then
         AC_MSG_WARN(Redland source dir not found !!)          AC_MSG_WARN(Raptor source dir not found !!)
         AC_MSG_WARN(Disabling redland build !)          AC_MSG_WARN(Disabling raptor build !)
         MAKEREDLAND=['#']          with_raptor="no"
         with_redland="no"  
 fi  fi
   
 #At this point, we know everything about Redland,  #At this point, we know everything about Raptor,
 #so either set the variables we will need later,  #so either set the variables we will need later,
 #or disable Annotations  #or disable Annotations
 if test "$with_redland" = "yes" ; then  if test "$with_raptor" = "yes" ; then
         AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"          if test "$with_system_raptor" != "yes" ; then
         if test "$with_system_redland" != "yes" ; then                  AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/raptor "
                 AMAYA_RAPTOR_SRC="amaya_comp_redland"                  AMAYA_RAPTOR_LIBS="../redland/raptor/.libs/libraptor.a"
                 AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor "                  AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/raptor"
                 AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a"                  BUILDRAPTOR="raptor"
                 AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"                  CURRENTPATH="`pwd`"
                   mkdir $BUILDRAPTOR
                   cd $BUILDRAPTOR &&
                           CC="$CC" CXX="$CXX" \
                           CPPFLAGS="-I$CURRENTPATH/../../libwww/modules/expat/lib" \
                           LDFLAGS="-L$CURRENTPATH/libwww/modules/expat -L$CURRENTPATH/libwww/modules/expat/.libs" \
                           ../../../redland/raptor/configure \
                           --build=$build_alias --host=$host_alias --target=$target_alias \
                           --disable-shared \
                           --with-xml-parser=expat \
                           --with-www=none
                           $ECHO "Raptor is configured"
                           $ECHO "Patching the raptor_config.h file to avoid including glib2-0"
                           $CP raptor_config.h raptor_config.h.orig
                           $SED "s/\(\#define HAVE_G_UTF8_NORMALIZE 1\)/\/* \1 *\//" \
                                   raptor_config.h.orig > raptor_config.h
                           $RM raptor_config.h.orig
                           $ECHO "Raptor is patched"
                   cd ..
         else          else
                 MAKEREDLAND=['#']                  raptor_includes=`$RAPTOR_CONFIG --cflags`
                 AMAYA_RAPTOR_SRC=                  raptor_libs=`$RAPTOR_CONFIG --libs`
                 redland_includes=`$REDLAND_CONFIG --cflags`  
           redland_libs=`$REDLAND_CONFIG --libs`  
                 AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS"                  AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS"
                 AMAYA_ANNOT_INCLUDES="$redland_includes -I\$(THOTDIR)/thotlib/include"                  AMAYA_ANNOT_INCLUDES="$raptor_includes -I\$(THOTDIR)/thotlib/include"
                 AMAYA_ANNOT_EXTRA_LIBS="$redland_libs"                  AMAYA_ANNOT_EXTRA_LIBS="$raptor_libs"
                 AMAYA_RAPTOR_INCLUDES="$redland_includes"                  AMAYA_RAPTOR_INCLUDES="$raptor_includes"
        fi         fi
 else  else
         with_annot="no"          with_annot="no"
Line 800  fi Line 787  fi
   
 ANNOTLIB_COMPILE_BM=['#']  ANNOTLIB_COMPILE_BM=['#']
   
   AC_SUBST(BUILDRAPTOR)
   
   AC_SUBST(AMAYA_ANNOT_OPTIONS)
   AC_SUBST(AMAYA_ANNOT_INCLUDES)
   AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)
   
   AC_SUBST(ANNOTLIB_COMPILE_BM)
   AC_SUBST(AMAYA_RAPTOR_LIBS)
   AC_SUBST(AMAYA_RAPTOR_INCLUDES)
   
 ###################End of Annotations Support####################  ###################End of Annotations Support####################
   
   
Line 1005  AC_SUBST(VPATHOPT) Line 1002  AC_SUBST(VPATHOPT)
   
 AC_SUBST(THOT_OPTIONS)  AC_SUBST(THOT_OPTIONS)
 AC_SUBST(AMAYA_OPTIONS)  AC_SUBST(AMAYA_OPTIONS)
 AC_SUBST(AMAYA_ANNOT_OPTIONS)  
 AC_SUBST(AMAYA_ANNOT_INCLUDES)  
 AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)  
 AC_SUBST(IMGLIBS)  AC_SUBST(IMGLIBS)
 AC_SUBST(EXTRA_INCLUDES)  AC_SUBST(EXTRA_INCLUDES)
   
Line 1018  AC_SUBST(WWWDAV) Line 1012  AC_SUBST(WWWDAV)
   
 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(ANNOTLIB_COMPILE_BM)
 AC_SUBST(AMAYA_RAPTOR_SRC)  
 AC_SUBST(AMAYA_RAPTOR_LIBS)  AC_SUBST(AMAYA_RAPTOR_LIBS)
 AC_SUBST(AMAYA_RAPTOR_INCLUDES)  AC_SUBST(AMAYA_RAPTOR_INCLUDES)
   
Removed from v.1.236  
changed lines
  Added in v.1.237

Webmaster