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

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

version 1.210, 2006/11/09 15:10:29 version 1.211, 2006/11/15 11:48:53
Line 212  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)
 +AC_ARG_WITH([gl],  AC_ARG_WITH([gl],
    AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]),     AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]),
    [case "${withval}" in     [case "${withval}" in
           yes) with_gl="yes" ;;            yes) with_gl="yes" ;;
Line 1258  dnl Line 1258  dnl
 dnl The options for each library or binary  dnl The options for each library or binary
 dnl  dnl
   
 THOT_OPTIONS="$OS_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS"  THOT_OPTIONS="$OS_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS"
   
   AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $TEMPLATES_OPTIONS"
   
 if test "$with_debug" = "yes" ; then  if test "$with_debug" = "yes" ; then
   AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS -DAMAYA_DEBUG"    AMAYA_OPTIONS="$AMAYA_OPTIONS -DAMAYA_DEBUG"
 else  
   AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS"  
 fi  fi
 AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS"  
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
   IMGLIBS=""    IMGLIBS=""
Line 1272  else Line 1272  else
   IMGLIBS="-ljpeg -lpng -lz"    IMGLIBS="-ljpeg -lpng -lz"
 fi  fi
   
 EXTRA_LIBS=  
 EXTRA_INCLUDES=  EXTRA_INCLUDES=
   
 # check for malloc.h  # check for malloc.h
Line 1353  AC_SUBST(AMAYA_ANNOT_OPTIONS) Line 1352  AC_SUBST(AMAYA_ANNOT_OPTIONS)
 AC_SUBST(AMAYA_ANNOT_INCLUDES)  AC_SUBST(AMAYA_ANNOT_INCLUDES)
 AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)  AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)
 AC_SUBST(IMGLIBS)  AC_SUBST(IMGLIBS)
 AC_SUBST(EXTRA_LIBS)  
 AC_SUBST(EXTRA_INCLUDES)  AC_SUBST(EXTRA_INCLUDES)
   
 AC_SUBST(DAVDIR)  AC_SUBST(DAVDIR)
Line 1376  dnl Line 1374  dnl
 dnl Include the option Makefile.xxx fragment according to the configure options  dnl Include the option Makefile.xxx fragment according to the configure options
 dnl  dnl
   
     AC_SUBST_FILE(www_frag)  www_frag=$srcdir/amaya/Makefile.libwww
     www_frag=$srcdir/amaya/Makefile.libwww  AC_SUBST_FILE(www_frag)
   
 if test "$with_math" = "no" ; then  if test "$with_math" = "no" ; then
     AC_SUBST_FILE(math_frag)  
     math_frag=/dev/null      math_frag=/dev/null
 else  else
     AC_SUBST_FILE(math_frag)  
     math_frag=$srcdir/amaya/Makefile.math      math_frag=$srcdir/amaya/Makefile.math
 fi  fi
   AC_SUBST_FILE(math_frag)
   
 if test "$with_svg" = "no" ; then  if test "$with_svg" = "no" ; then
     AC_SUBST_FILE(svg_frag)  
     svg_frag=/dev/null      svg_frag=/dev/null
 else  else
     AC_SUBST_FILE(svg_frag)  
     svg_frag=$srcdir/amaya/Makefile.svg      svg_frag=$srcdir/amaya/Makefile.svg
 fi  fi
   AC_SUBST_FILE(svg_frag)
   
 if test "$with_annot" = "yes" ; then  if test "$with_annot" = "yes" ; then
     AC_SUBST_FILE(annot_frag)  
     annot_frag=$srcdir/annotlib/Makefile.annot      annot_frag=$srcdir/annotlib/Makefile.annot
 else  else
     AC_SUBST_FILE(annot_frag)  
     annot_frag=/dev/null      annot_frag=/dev/null
 fi  fi
   AC_SUBST_FILE(annot_frag)
   
 if test "$with_dav" = "yes" ; then  if test "$with_dav" = "yes" ; then
     AC_SUBST_FILE(dav_frag)  
     dav_frag=$srcdir/davlib/Makefile.dav      dav_frag=$srcdir/davlib/Makefile.dav
 else  else
     AC_SUBST_FILE(dav_frag)  
     dav_frag=/dev/null      dav_frag=/dev/null
 fi  fi
   AC_SUBST_FILE(dav_frag)
   
 if test "$with_templates" = "yes" ; then  if test "$with_templates" = "yes" ; then
     AC_SUBST_FILE(templates_frag)  
     templates_frag=$srcdir/amaya/Makefile.templates      templates_frag=$srcdir/amaya/Makefile.templates
 else  else
     AC_SUBST_FILE(templates_frag)  
     templates_frag=/dev/null      templates_frag=/dev/null
 fi  fi
   AC_SUBST_FILE(templates_frag)
   
 dnl  ***************************************************************  dnl  ***************************************************************
 dnl  dnl
Removed from v.1.210  
changed lines
  Added in v.1.211

Webmaster