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

Diff for /Amaya/configure.in between versions 1.108 and 1.109

version 1.108, 2003/02/06 18:23:31 version 1.109, 2003/02/11 15:20:55
Line 771  AC_SUBST(PRINTIFNOTGL) Line 771  AC_SUBST(PRINTIFNOTGL)
 AC_ARG_ENABLE(svg,           [  --disable-svg           remove SVG support ])  AC_ARG_ENABLE(svg,           [  --disable-svg           remove SVG support ])
 AC_ARG_ENABLE(annot,         [  --disable-annot         remove Annotations support ])  AC_ARG_ENABLE(annot,         [  --disable-annot         remove Annotations support ])
 AC_ARG_ENABLE(raptor,        [  --disable-raptor        disable the raptor RDF parser ])  AC_ARG_ENABLE(raptor,        [  --disable-raptor        disable the raptor RDF parser ])
   AC_ARG_ENABLE(redland,       [  --disable-redland       disable the redland RDF library ])
 AC_ARG_ENABLE(bookmarks,     [  --enable-bookmarks      enables experimental bookmark support ])  AC_ARG_ENABLE(bookmarks,     [  --enable-bookmarks      enables experimental bookmark support ])
 AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])  AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])
   
Line 825  else Line 826  else
 fi  fi
   
 dnl  dnl
   dnl The redlandr library is disabled by default
   dnl
   if test "$with_redland" = "" ; then
       if test "$enable_redland" = "yes" ; then
           with_redland="yes"
       else
           with_redland="no"
       fi
   else
       with_redland="no"
   fi
   
   dnl
 dnl The bookmarks supportr is disabled by default  dnl The bookmarks supportr is disabled by default
 dnl  dnl
 if test "$with_bookmarks" = "" ; then  if test "$with_bookmarks" = "" ; then
Line 911  if test "$build_amaya" = "yes" ; then Line 925  if test "$build_amaya" = "yes" ; then
         fi          fi
     fi      fi
   
       if test "$with_raptor" = "yes" -a "$with_redland" = "yes" ; then
          AC_MSG_WARN(Disabling raptor build as redland is enabled !)
          MAKERAPTOR=['#']
          with_raptor="no"
       fi
   
     if test "$with_raptor" = "yes" -a "$with_annot" = "no" ; then      if test "$with_raptor" = "yes" -a "$with_annot" = "no" ; then
        AC_MSG_WARN(Disabling raptor build as annotations are disabled !)         AC_MSG_WARN(Disabling raptor build as annotations are disabled !)
        MAKERAPTOR=['#']         MAKERAPTOR=['#']
Line 922  if test "$build_amaya" = "yes" ; then Line 942  if test "$build_amaya" = "yes" ; then
        AC_MSG_WARN(Disabling raptor build !)         AC_MSG_WARN(Disabling raptor build !)
        MAKERAPTOR=['#']         MAKERAPTOR=['#']
        with_raptor="no"         with_raptor="no"
     else      fi
   
       if test "$with_raptor" = "yes" ; then
        AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DRAPTOR_RDF_PARSER -I\$(THOTDIR)/libraptor"         AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DRAPTOR_RDF_PARSER -I\$(THOTDIR)/libraptor"
        AMAYA_RAPTOR_LIBS="../libraptor/.libs/libraptor.a"         AMAYA_RAPTOR_LIBS="../libraptor/.libs/libraptor.a"
        AMAYA_RAPTOR_SRC="amaya_comp_libraptor"         AMAYA_RAPTOR_SRC="amaya_comp_libraptor"
        AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/libraptor"         AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/libraptor"
     fi      fi
   
       if test "$with_redland" = "yes" -a "$with_annot" = "no" ; then
          AC_MSG_WARN(Disabling redland build as annotations are disabled !)
          MAKEREDLAND=['#']
          with_redland="no"
       fi
   
       if test "$with_redland" = "yes" -a ! -d "$srcdir/redland" ; then
          AC_MSG_WARN(Redland source dir not found !!)
          AC_MSG_WARN(Disabling redland build !)
          MAKEREDLAND=['#']
          with_redland="no"
       fi
   
       if test "$with_redland" = "yes" ; then
          AMAYA_RAPTOR_SRC="amaya_comp_redland"
          AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DLIBRDF_INTERNAL=1 -DRAPTOR_RDF_PARSER -I\$(THOTDIR)/redland/librdf -I\$(THOTDIR)/redland/raptor"
          AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a -lexpat"
          AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/redland/librdf -I\$(THOTDIR)/redland/raptor"
       fi
   
     dnl control whether we should build the bookmarks support      dnl control whether we should build the bookmarks support
     if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then      if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then
        AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)         AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)
        with_bookmarks="no"         with_bookmarks="no"
     fi      fi
     if test "$with_bookmarks" = "yes" -a "$with_raptor" = "no" ; then      if test "$with_bookmarks" = "yes" -a "$with_redland" = "no" ; then
        AC_MSG_WARN(Disabling bookmarks build as raptor is disabled !)         AC_MSG_WARN(Disabling bookmarks build as redland is disabled !)
        with_bookmarks="no"         with_bookmarks="no"
     fi      fi
     if test "$with_bookmarks" = "yes" ; then      if test "$with_bookmarks" = "yes" ; then
Line 946  if test "$build_amaya" = "yes" ; then Line 988  if test "$build_amaya" = "yes" ; then
     fi      fi
   
     dnl control whether we should use libwww's rdf parser      dnl control whether we should use libwww's rdf parser
     if test "$with_raptor" = "yes" ; then      if test "$with_raptor" = "yes" -o "$with_redland" = "yes"; then
        dnl not all the function calls have been cleared as of today,          dnl not all the function calls have been cleared as of today, 
        dnl we still need libwww's rdf parser          dnl we still need libwww's rdf parser 
        MAKE_LIBWWW_RDF_PARSER=         MAKE_LIBWWW_RDF_PARSER=
Line 1036  AC_SUBST(WITHDAV) Line 1078  AC_SUBST(WITHDAV)
 AC_SUBST(WWWDAV)  AC_SUBST(WWWDAV)
   
 AC_SUBST(MAKERAPTOR)  AC_SUBST(MAKERAPTOR)
   AC_SUBST(MAKEREDLAND)
 AC_SUBST(ANNOTLIB_COMPILE_BM)  AC_SUBST(ANNOTLIB_COMPILE_BM)
 AC_SUBST(AMAYA_RAPTOR_LIBS)  
 AC_SUBST(AMAYA_RAPTOR_SRC)  AC_SUBST(AMAYA_RAPTOR_SRC)
   AC_SUBST(AMAYA_RAPTOR_LIBS)
 AC_SUBST(AMAYA_RAPTOR_INCLUDES)  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)
Line 1168  if test "$build_amaya" = "yes" ; then Line 1211  if test "$build_amaya" = "yes" ; then
     if test "$with_raptor" = "yes" ; then      if test "$with_raptor" = "yes" ; then
         echo Amaya configured with the Raptor RDF parser          echo Amaya configured with the Raptor RDF parser
     fi      fi
       if test "$with_redland" = "yes" ; then
           echo Amaya configured with the Redland RDF library
       fi
     if test "$with_bookmarks" = "yes" ; then      if test "$with_bookmarks" = "yes" ; then
         echo Amaya configured with bookmarks support \(experimental\)          echo Amaya configured with bookmarks support \(experimental\)
     fi      fi
Removed from v.1.108  
changed lines
  Added in v.1.109

Webmaster