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

Diff for /Amaya/configure.in between versions 1.119 and 1.120

version 1.119, 2003/10/01 09:32:30 version 1.120, 2003/10/20 13:45:11
Line 205  AC_TYPE_SIGNAL Line 205  AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF  AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy)  AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy)
   
   
   
 AC_ARG_WITH(GL,              [  --with-gl               enable Opengl canvas (experimental) ])  AC_ARG_WITH(GL,              [  --with-gl               enable Opengl canvas (experimental) ])
 dnl  dnl
 dnl GL canvas is disabled by default  dnl GL canvas is disabled by default
Line 227  if test "$with_gl" = "" ; then Line 225  if test "$with_gl" = "" ; then
   fi    fi
 fi    fi  
   
 GTK_OPTIONS=  #GTK_OPTIONS=
 AC_ARG_WITH(gtk, [  --without-gtk              use Motif instead of GTK])  #AC_ARG_WITH(gtk, [  --without-gtk              use Motif instead of GTK])
 if test "$withval" = "no" ; then  #if test "$withval" = "no" ; then
   if test "$with_gl" = "yes" ; then  #  if test "$with_gl" = "yes" ; then
     with_gtk="yes"  #    with_gtk="yes"
   else  #  else
   #    with_gtk="no"
   #  fi
   #else
   #  with_gtk="yes"
   #fi
   
   # check if gtk gui should be used
   AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])
   if test "$with_gtk" = "yes" -o "$enable_gtk" = "yes" ; then
     if test "$withval" = "no" ; then
     with_gtk="no"      with_gtk="no"
     else
       with_gtk="yes"
     fi
   fi
   
   # check if motif gui should be used
   AC_ARG_WITH(motif, [  --with-motif            use MOTIF GUI toolkit ])
   if test "$with_motif" = "yes" -o "$enable_motif" = "yes" ; then
     with_motif="yes"
     no_motif=no
   fi
   
   # Check if a GUI toolkit is enabled
   if test "$with_motif" = "no" -o "$with_motif" = "" ; then
     if test "$with_gtk" = "no" -o "$with_gtk" = "" ; then
       # Default GUI toolkits
       with_motif="no"
       no_motif=yes
       with_gtk="yes"
   fi    fi
 else  
   with_gtk="yes"  
 fi  fi
   
   if test "$with_motif" = "yes" ; then
     if test "$with_gtk" = "yes" ; then
       echo 
       echo "****************************************************************"
       echo " ERROR: "
       echo " More than one GUI toolkit is enable"
       echo " Only one GUI toolkit should be enable (turn off one)"
       echo " exemple ok :  ../configure --with-gtk "
       echo " exemple !ok : ../configure --with-gtk --with-motif"
       echo "****************************************************************"
       echo 
       exit 1
     fi
     if test "$with_gl" = "yes" ; then
       echo 
       echo "****************************************************************"
       echo " ERROR: "
       echo " MOTIF GUI doesn't support OpenGL canvas (turn off --with-gl)"
       echo "****************************************************************"
       echo 
       exit 1
     fi
   fi
     
 if test "$with_gtk" = "yes" ; then  if test "$with_gtk" = "yes" ; then
   for ac_dir in               \    for ac_dir in               \
     /usr/lib/glib/include     \      /usr/lib/glib/include     \
Line 280  AC_SUBST(GTK_LIBRARIES) Line 329  AC_SUBST(GTK_LIBRARIES)
 GTK_OPTIONS="-D_GTK"  GTK_OPTIONS="-D_GTK"
   no_motif=yes    no_motif=yes
   no_graphic=yes    no_graphic=yes
 else  fi
   
   if test "$with_motif" = "yes" ; then
 dnl  dnl
 dnl Checking for Motif libraries and includes  dnl Checking for Motif libraries and includes
 dnl  dnl
Line 447  AC_SUBST(MOTIF_INCLUDES) Line 498  AC_SUBST(MOTIF_INCLUDES)
 AC_SUBST(MOTIF_LIBRARIES)  AC_SUBST(MOTIF_LIBRARIES)
 ])  ])
   
   MOTIF_OPTIONS="-D_MOTIF"
   
 AC_PATH_MOTIF  AC_PATH_MOTIF
 fi  fi
   
Line 465  dnl  *********************************** Line 518  dnl  ***********************************
 dnl echo "with gtk is ${with_gtk}, with gl is ${with_gl}\n"  dnl echo "with gtk is ${with_gtk}, with gl is ${with_gl}\n"
   
 if test "${with_gtk}" != "yes" -o "${with_gl}" = "yes" ; then  if test "${with_gtk}" != "yes" -o "${with_gl}" = "yes" ; then
   AC_ARG_WITH(graphic-libs, [  --with-graphic-libs    use static libjpeg, libpng.])    AC_ARG_WITH(graphic-libs, [  --with-graphic-libs     use static libjpeg, libpng.])
   if test "$withval" = "no" ; then    if test "$withval" = "no" ; then
     no_graphic=yes      no_graphic=yes
   fi    fi
Line 886  if test "$with_generic_xml" = "" ; then Line 939  if test "$with_generic_xml" = "" ; then
     fi      fi
 fi  fi
   
 AC_ARG_WITH(dav,            [  --with-dav             enable WebDAV support (experimental) ])  AC_ARG_WITH(dav,            [  --with-dav              enable WebDAV support (experimental) ])
 dnl  dnl
 dnl DAV support disabled by default  dnl DAV support disabled by default
 dnl  dnl
Line 1093  dnl Line 1146  dnl
 dnl The options for each library or binary  dnl The options for each library or binary
 dnl  dnl
   
 THOT_OPTIONS="$GTK_OPTIONS $I18N_OPTIONS $GL_OPTIONS"  THOT_OPTIONS="$GTK_OPTIONS $I18N_OPTIONS $GL_OPTIONS $MOTIF_OPTIONS"
 AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $GL_OPTIONS"  AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $GL_OPTIONS $MOTIF_OPTIONS"
 #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"  #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
 AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS $I18N_OPTIONS"  AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS $I18N_OPTIONS"
   
Line 1318  fi Line 1371  fi
   
 if test "$with_gtk" = "yes" ; then  if test "$with_gtk" = "yes" ; then
     echo "Amaya configured with GTK"      echo "Amaya configured with GTK"
 else   fi
   
   if test "$with_motif" = "yes" ; then
   if test "$no_motif" = "yes" ; then    if test "$no_motif" = "yes" ; then
     echo "Motif seems not installed on this machine"        echo "Motif seems not installed on this machine"
     echo "Amaya need Motif 1.2 or 2.0"        echo "Amaya need Motif 1.2 or 2.0"
   else    else
     if test "$motif_includes" = "" ; then      if test "$motif_includes" = "" ; then
       echo "Motif includes were not found"        echo "Motif includes were not found"
Line 1332  else Line 1387  else
         echo "Motif libraries were not found"          echo "Motif libraries were not found"
         echo "Amaya might not compile"          echo "Amaya might not compile"
         echo "Edit your Option file"          echo "Edit your Option file"
         else
           echo "Amaya configured with MOTIF"
       fi        fi
     fi      fi
   fi    fi
Line 1340  fi Line 1397  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"
 echo ""  echo ""
   
Removed from v.1.119  
changed lines
  Added in v.1.120

Webmaster