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

Diff for /Amaya/configure.in between versions 1.214 and 1.215

version 1.214, 2006/11/29 15:55:09 version 1.215, 2006/11/30 09:39:00
Line 380  fi Line 380  fi
   
 if test "$with_mesa" = "yes" ; then  if test "$with_mesa" = "yes" ; then
   # --------- compile Mesa library (opengl) --------------- #    # --------- compile Mesa library (opengl) --------------- #
   OLDDIR=`pwd`  
   GL_BUILDDIR="${OLDDIR}/Mesa"  
   
   # check that sources of Mesa exists    # check that sources of Mesa exists
   if test ! -f ../../Mesa/Makefile ; then    if test ! -f ../../Mesa/Makefile ; then
     AC_MSG_ERROR(Mesa library sources not found (opengl). Please download Mesa sources (http://www.mesa3d.org/) or remove --with-gl option !)      AC_MSG_ERROR(Mesa library sources not found (opengl). Please download Mesa sources (http://www.mesa3d.org/) or remove --with-gl option !)
   
   echo "---> Install Mesa library into ${GL_BUILDDIR}"  
   mkdir -p ${GL_BUILDDIR}  
   cp -r ../../Mesa/* ${GL_BUILDDIR}  
   fi    fi
   
   echo "---> Install Mesa library into ${GL_BUILDDIR} - DONE"    OLDDIR=`pwd`
     GL_BUILDDIR="${OLDDIR}/Mesa"
     if test ! -d "$GL_BUILDDIR" ; then
       echo "---> Install Mesa library into ${GL_BUILDDIR}"
       mkdir -p ${GL_BUILDDIR}
       cp -r ../../Mesa/* ${GL_BUILDDIR}
       echo "---> Install Mesa library into ${GL_BUILDDIR} - DONE"
     fi
   
   # this is the flags used to build amaya with OpenGL    # this is the flags used to build amaya with OpenGL
   GL_OPTIONS="-D_GL"    GL_OPTIONS="-D_GL"
Line 1117  if test "$with_redland" = "yes" ; then Line 1118  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_RAPTOR_SRC="amaya_comp_redland"
                 AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor/src "                  AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor "
                 AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/src/.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/src"                  AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
         else          else
                 MAKEREDLAND=['#']                  MAKEREDLAND=['#']
                 AMAYA_RAPTOR_SRC=                  AMAYA_RAPTOR_SRC=
Removed from v.1.214  
changed lines
  Added in v.1.215

Webmaster