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

Diff for /Amaya/configure.in between versions 1.123 and 1.124

version 1.123, 2003/11/19 12:33:16 version 1.124, 2003/11/24 14:45:34
Line 255  if test "$with_motif" = "yes" -o "$enabl Line 255  if test "$with_motif" = "yes" -o "$enabl
   no_motif=no    no_motif=no
 fi  fi
   
   # check if wxWindows gui should be used
   AC_ARG_WITH(wx, [  --with-wx               use wxWindows GUI toolkit (experimental)])
   if test "$with_wx" = "yes" -o "$enable_wx" = "yes" ; then
     if test "$withval" = "no" ; then
       with_wx="no"
     else
       with_wx="yes"
     fi
   fi
   
 # Check if a GUI toolkit is enabled  # Check if a GUI toolkit is enabled
 if test "$with_motif" = "no" -o "$with_motif" = "" ; then  if test "$with_motif" = "no" -o "$with_motif" = "" ; then
   if test "$with_gtk" = "no" -o "$with_gtk" = "" ; then    if test "$with_wx" = "no" -o "$with_wx" = "" ; then
     # Default GUI toolkits      if test "$with_gtk" = "no" -o "$with_gtk" = "" ; then
     with_motif="no"        # Default GUI toolkits
     no_motif=yes        with_motif="no"
     with_gtk="yes"        with_wx="no"
         no_motif=yes
         with_gtk="yes"
       fi
   fi    fi
 fi  fi
   
Line 328  if test "$with_gtk" = "yes" ; then Line 341  if test "$with_gtk" = "yes" ; then
     fi      fi
   done    done
   
 GTK_INCLUDES="`gtk-config --cflags`"    GTK_INCLUDES="`gtk-config --cflags`"
 AC_SUBST(GTK_INCLUDES)    AC_SUBST(GTK_INCLUDES)
 GTK_LIBRARIES="`gtk-config --libs`"    GTK_LIBRARIES="`gtk-config --libs`"
 dnl GL doesn't need the imlib    dnl GL doesn't need the imlib
 if test "${with_gl}" != "yes" ; then    if test "${with_gl}" != "yes" ; then
  GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"     GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"
 fi    fi
   
 AC_SUBST(GTK_LIBRARIES)    AC_SUBST(GTK_LIBRARIES)
 GTK_OPTIONS="-D_GTK"    GTK_OPTIONS="-D_GTK"
   no_motif=yes    no_motif=yes
   no_graphic=yes    no_graphic=yes
 fi  fi
   
   if test "$with_wx" = "yes" ; then
     WX_INCLUDES="`wx-config --cxxflags`"
     AC_SUBST(WX_INCLUDES)
   
     dnl GL is used ?
     if test "${with_gl}" == "yes" ; then
       WX_LIBRARIES="`wx-config --gl-libs`"
     else
       WX_LIBRARIES="`wx-config --libs`"
     fi
   
     AC_SUBST(WX_LIBRARIES)
     WX_OPTIONS="-D_WX"
   fi
   
 if test "$with_motif" = "yes" ; then  if test "$with_motif" = "yes" ; then
 dnl  dnl
 dnl Checking for Motif libraries and includes  dnl Checking for Motif libraries and includes
Line 1165  dnl Line 1193  dnl
 dnl The options for each library or binary  dnl The options for each library or binary
 dnl  dnl
   
 THOT_OPTIONS="$I18N_OPTIONS $MOTIF_OPTIONS $GTK_OPTIONS $GL_OPTIONS $NOGUI_OPTIONS"  THOT_OPTIONS="$I18N_OPTIONS $MOTIF_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS"
 AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $MOTIF_OPTIONS $GTK_OPTIONS $GL_OPTIONS $NOGUI_OPTIONS"  AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $MOTIF_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_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 1413  if test "$with_motif" = "yes" ; then Line 1441  if test "$with_motif" = "yes" ; then
   fi    fi
 fi  fi
   
   if test "$with_wx" = "yes" ; then
       echo "Amaya configured with wxWindows (experimental)"
   fi
   
 if test "$with_nogui" = "yes" ; then  if test "$with_nogui" = "yes" ; then
   echo "Amaya configured with no GUI toolkit"    echo "Amaya configured with no GUI toolkit"
 fi  fi
Removed from v.1.123  
changed lines
  Added in v.1.124

Webmaster