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

Diff for /Amaya/configure.in between versions 1.209 and 1.210

version 1.209, 2006/10/26 07:47:31 version 1.210, 2006/11/09 15:10:29
Line 200  case $AMAYAOS in Line 200  case $AMAYAOS in
   MACOSX)      OS_OPTIONS="-D_UNIX -D_MACOS" ;;    MACOSX)      OS_OPTIONS="-D_UNIX -D_MACOS" ;;
 esac  esac
   
 AC_ARG_WITH(GL,              [  --with-gl               enable Opengl canvas (experimental) ])  
 dnl  dnl
 dnl GL canvas is disabled by default in 8.7.x  dnl GL canvas is disabled by default in 8.7.x
 dnl GL canvas is enabled by default in 9.x  dnl GL canvas is enabled by default in 9.x
Line 213  dnl (tesselation is used for polygons wi Line 212  dnl (tesselation is used for polygons wi
 dnl gtkgl is for integration of opengl in GTK  dnl gtkgl is for integration of opengl in GTK
 dnl freetype2 is for text drawing (fonts ...)  dnl freetype2 is for text drawing (fonts ...)
 dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)  dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)
 if test "$with_gl" = "" ; then  +AC_ARG_WITH([gl],
  if test "$enable_gl" = "yes" ; then     AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]),
     with_gl="yes"     [case "${withval}" in
   else            yes) with_gl="yes" ;;
     with_gl="no"            no)  with_gl="no" ;;
   fi            *) AC_MSG_ERROR(bad value ${withval} for --with-gl) ;;
 fi           esac],
           [with_gl="no"])
   
 # check if gtk gui should be used  # check if gtk gui should be used
 AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])  AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])
Line 619  fi # with_wx = no Line 619  fi # with_wx = no
   
 # the wx version  # the wx version
 AMAYAWX_MAJVER=9  AMAYAWX_MAJVER=9
 AMAYAWX_MINVER=52  AMAYAWX_MINVER=53
 AMAYAWX_SUBVER=0  AMAYAWX_SUBVER=0
   
 #the old version (to remove when switching on wx)  #the old version (to remove when switching on wx)
 AMAYA_MAJVER=8  AMAYA_MAJVER=8
 AMAYA_MINVER=52  AMAYA_MINVER=53
 AMAYA_SUBVER=0  AMAYA_SUBVER=0
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
Line 995  fi # "$with_gtk" = "yes" Line 995  fi # "$with_gtk" = "yes"
   fi    fi
   done    done
   
 # not used in makefiles  
 #  AC_SUBST(STDCPP_INCLUDES)  
 #  AC_SUBST(STDCPP_LIBRARIES)  
   
   NOPRINT=""  
   PRINTIFNOTGL=" print_prog"  
   
 else # if with_gl or with_mesa  
   
   NOPRINT=""  
   PRINTIFNOTGL=" print_prog"  
   
 fi # if with_gl or with_mesa  fi # if with_gl or with_mesa
   
 AC_SUBST(PRINTIFNOTGL)  
 AC_SUBST(NOPRINT)  
   
   
 AC_ARG_ENABLE(svg,           [  --disable-svg           remove SVG support ])  
 AC_ARG_ENABLE(annot,         [  --disable-annot         remove Annotations support ])  
 AC_ARG_ENABLE(redland,       [  --disable-redland       disable the redland RDF library ])  
 AC_ARG_ENABLE(system-redland,       [  --enable-system-redland try the redland RDF system library ])  
 AC_ARG_ENABLE(bookmarks,     [  --enable-bookmarks      enables experimental bookmark support ])  
 AC_ARG_ENABLE(templates,     [  --disable-templates     disables experimental templates support ])  
 AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])  
   
 AC_ARG_ENABLE([svg],  AC_ARG_ENABLE([svg],
         AC_HELP_STRING([--disable-svg],[disable SVG support]),          AC_HELP_STRING([--disable-svg],[disable SVG support]),
         [case "${enableval}" in          [case "${enableval}" in
Line 1030  AC_ARG_ENABLE([svg], Line 1006  AC_ARG_ENABLE([svg],
         esac],          esac],
         [with_svg="yes"])          [with_svg="yes"])
   
   ##########################Annotations and Bookmarks Support####################
 dnl  dnl
 dnl annotations are enabled by default  dnl annotations are enabled by default
 dnl  dnl
Line 1043  AC_ARG_ENABLE([annot], Line 1020  AC_ARG_ENABLE([annot],
         [with_annot="yes"])          [with_annot="yes"])
   
 dnl  dnl
 dnl The redland library is enabled by default  
 dnl  
 AC_ARG_ENABLE([redland],  
         AC_HELP_STRING([--disable-redland],[disable redland RDF support]),  
         [case "${enableval}" in  
           yes) with_redland="yes" ;;  
           no)  with_redland="no" ;;  
           *) AC_MSG_ERROR(bad value ${enableval} for --disable-redland) ;;  
         esac],  
         [with_redland="yes"])  
   
 dnl  
 dnl The bookmarks support is disabled by default  dnl The bookmarks support is disabled by default
 dnl  dnl
 AC_ARG_ENABLE([bookmarks],  AC_ARG_ENABLE([bookmarks],
         AC_HELP_STRING([--enable-bookmarks],[enable experimental bookmark support]),          AC_HELP_STRING([--enable-bookmarks],[enable experimental bookmark support]),
         [case "${enableval}" in          [case "${enableval}" in
           yes) with_bookmarks="yes"; with_redland="yes" ;;            yes) with_bookmarks="yes" ;;
           no)  with_bookmarks="no" ;;            no)  with_bookmarks="no" ;;
           *) AC_MSG_ERROR(bad value ${enableval} for --enable-bookmarks) ;;            *) AC_MSG_ERROR(bad value ${enableval} for --enable-bookmarks) ;;
         esac],          esac],
         [with_bookmarks="no"])          [with_bookmarks="no"])
   
   #if the directory containing Annotlib
   #and Bookmarks is not present,
   #don't try to build them
   if test ! -f $srcdir/annotlib/Makefile.in ; then
           AC_MSG_WARN(Annotation makefile not found !!)
           AC_MSG_WARN(Disabling Annotations build !)
           with_annot="no"
           with_bookmarks="no"
   fi
   
   if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then
      AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)
      with_bookmarks="no"
   fi
   
   #annot and bookmarks need Redland
   if test "$with_annot" = "yes" -o "$with_bookmarks" = "yes" ; then
           with_redland="yes"
   else
           with_redland="no"
   fi
   
   AC_ARG_ENABLE([system-redland],
           AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),
           [case "${enableval}" in
             yes) with_system_redland="yes";;
             no)  with_system_redland="no" ;;
             *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;
           esac],
           [with_system_redland="no"])
   
   #If Redland is needed and we are asked
   #to use the system library, check if is present
   if test "$with_redland" = "yes" -a "$with_system_redland" = "yes" ; then
       # check to see if we have a redland library
       AC_PATH_PROG([REDLAND_CONFIG],[redland-config])
   
       if test "$REDLAND_CONFIG" = "" ; then
           AC_MSG_WARN(Not using system-provided redland library)
           with_system_redland="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
   
   #if we use the builtin library,
   #check it is present
   if test "$with_redland" = "yes" -a "$with_system_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
   
   #At this point, we know everything about Redland,
   #so either set the variables we will need later,
   #ot disable Annotations and Bookmarks
   if test "$with_redland" = "yes" ; then
           AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"
           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_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a"
                   AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
           else
                   MAKEREDLAND=['#']
                   AMAYA_RAPTOR_SRC=
                   redland_includes=`$REDLAND_CONFIG --cflags`
             redland_libs=`$REDLAND_CONFIG --libs`
                   AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS"
                   AMAYA_ANNOT_INCLUDES="$redland_includes -I\$(THOTDIR)/thotlib/include"
                   AMAYA_ANNOT_EXTRA_LIBS="$redland_libs"
                   AMAYA_RAPTOR_INCLUDES="$redland_includes"
          fi
   else
           with_annot="no"
           with_bookmarks="no"
   fi
   
   #Bookmarks require some specific flags
   if test "$with_bookmarks" = "yes" ; then
           ANNOTLIB_COMPILE_BM=
           AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"
   else
           ANNOTLIB_COMPILE_BM=['#']
   fi
   
   ###################End of Annotations and Bookmarks Support####################
   
   
 dnl  dnl
 dnl The templates support is enabled by default  dnl The templates support is enabled by default
 dnl  dnl
Line 1109  else Line 1191  else
  GENERIC_XML_OPTIONS=""   GENERIC_XML_OPTIONS=""
 fi  fi
   
 AC_ARG_ENABLE([system-redland],  
         AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),  
         [case "${enableval}" in  
           yes) with_system_redland="yes"; with_redland="yes" ;;  
           no)  with_system_redland="no" ;;  
           *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;  
         esac],  
         [with_system_redland="no"])  
   
 dnl  dnl
 dnl WebDAV support enabled by default  dnl WebDAV support enabled by default
 dnl  dnl
Line 1166  if test "$build_amaya" = "yes" ; then Line 1239  if test "$build_amaya" = "yes" ; then
         fi          fi
     fi      fi
   
     if test ! -f $srcdir/annotlib/Makefile.in ; then  
         if test "$with_annot" = "yes" ; then  
             AC_MSG_WARN(Annotation makefile not found !!)  
             AC_MSG_WARN(Disabling Annotations build !)  
             with_annot="no"  
         fi  
     fi  
   
     if test "$with_redland" = "yes" -a "$with_annot" = "no" -a "$with_bookmarks" = "no"; then  
        AC_MSG_WARN(Disabling redland as neither annotations nor bookmarks are enabled !)  
        MAKERAPTOR=['#']  
        with_raptor="no"  
     fi  
   
     redland_compile_source=yes  
     if test "$with_redland" = "yes" -a "$with_system_redland" = "yes" ; then  
        # check to see if we have a redland library  
        AC_MSG_CHECKING(system redland library)  
        redland_min_version=0.9.16  
        REDLAND_CONFIG="redland-config"  
        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)  
        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";  
          else   
            if test -e "/usr/local/include/redland.h" ; then  
              REDLAND_HEADERS="/usr/local/include";  
            fi  
          fi           
          if test $REDLAND_HEADERS != ""; then  
            AC_MSG_RESULT(yes - have development version)  
            redland_compile_source=no  
          else  
            AC_MSG_RESULT(no - no development version)  
          fi  
        fi  
     fi  
   
     if test "$with_redland" = "yes" -a "$redland_compile_source" = "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_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND -DRAPTOR_RDF_PARSER"  
        if test "$redland_compile_source" = "yes" ; then  
          AMAYA_RAPTOR_SRC="amaya_comp_redland"  
          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_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"  
        else  
          MAKEREDLAND=['#']  
          AMAYA_RAPTOR_SRC=  
          redland_includes=`$REDLAND_CONFIG --cflags`  
          redland_libs=`$REDLAND_CONFIG --libs`  
          AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS"  
          AMAYA_ANNOT_INCLUDES="$redland_includes -I\$(THOTDIR)/thotlib/include"  
          AMAYA_ANNOT_EXTRA_LIBS="$redland_libs"  
          AMAYA_RAPTOR_INCLUDES="$redland_includes"  
        fi  
     fi  
   
   
     dnl control whether we should build the bookmarks support  
     if test "$with_annot" = "yes" -a "$with_redland" = "no" ; then  
        AC_MSG_WARN(Disabling annotations build as redland is disabled !)  
        with_annot="no"  
     fi  
     if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then  
        AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)  
        with_bookmarks="no"  
     fi  
     if test "$with_bookmarks" = "yes" -a "$with_redland" = "no" ; then  
        AC_MSG_WARN(Disabling bookmarks build as redland is disabled !)  
        with_bookmarks="no"  
     fi  
     if test "$with_bookmarks" = "yes" ; then  
         ANNOTLIB_COMPILE_BM=  
         AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"  
     else  
         ANNOTLIB_COMPILE_BM=['#']  
     fi  
   
     if test ! -f $srcdir/davlib/Makefile.in ; then      if test ! -f $srcdir/davlib/Makefile.in ; then
         if test "$with_dav" = "yes" ; then          if test "$with_dav" = "yes" ; then
             AC_MSG_WARN(WebDAV makefile not found !!)              AC_MSG_WARN(WebDAV makefile not found !!)
Line 1529  if test "$build_amaya" = "yes" ; then Line 1507  if test "$build_amaya" = "yes" ; then
     if test "$with_annot" = "yes" ; then      if test "$with_annot" = "yes" ; then
         echo Amaya configured with Annotations support          echo Amaya configured with Annotations support
     fi      fi
     if test "$with_raptor" = "yes" ; then  
         echo Amaya configured with the Raptor RDF parser  
     fi  
     if test "$with_redland" = "yes" ; then      if test "$with_redland" = "yes" ; then
         if test "$with_system_redland" = "no" ; then          if test "$with_system_redland" = "no" ; then
           echo Amaya configured with the Redland RDF library \(local source\)            echo Amaya configured with the Redland RDF library \(local source\)
Line 1584  if test "$with_wx" = "yes" ; then Line 1559  if test "$with_wx" = "yes" ; then
   fi    fi
 fi  fi
   
 if test "$with_nogui" = "yes" ; then  
   echo "Amaya configured without GUI toolkit"  
 fi  
   
   
 echo ""  echo ""
 echo "Now type \"make\" (GNU make preferably) to build the binaries"  echo "Now type \"make\" (GNU make preferably) to build the binaries"
Removed from v.1.209  
changed lines
  Added in v.1.210

Webmaster