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

Diff for /Amaya/configure.in between versions 1.154 and 1.155

version 1.154, 2004/10/28 14:22:08 version 1.155, 2005/01/21 18:57:35
Line 217  if test "$with_gtk" = "yes" -o "$enable_ Line 217  if test "$with_gtk" = "yes" -o "$enable_
   fi    fi
 fi  fi
   
   # check if mac version is used
   AC_ARG_WITH(mac, [  --with-mac              generate mac version ])
   if test "$with_mac" = "" ; then
    if test "$enable_mac" = "yes" ; then
       with_mac="yes"
     else
       with_mac="no"
     fi
   fi
   
 # check for mesa library (OpenGL)  # check for mesa library (OpenGL)
 AC_ARG_WITH(MESA,              [  --with-mesa               enable OpenGL canvas with internal MesaLib (only used with wxWidgets GUI) ])  AC_ARG_WITH(MESA,              [  --with-mesa             enable OpenGL canvas with internal MesaLib (only used with wxWidgets GUI) ])
 if test "$with_mesa" = "" ; then  if test "$with_mesa" = "" ; then
  if test "$enable_mesa" = "yes" ; then   if test "$enable_mesa" = "yes" ; then
     with_mesa="yes"      with_mesa="yes"
Line 261  if test "$with_nogui" = "yes" -o "$enabl Line 271  if test "$with_nogui" = "yes" -o "$enabl
 fi  fi
   
 # check if wxWidgets debug is enable  # check if wxWidgets debug is enable
 AC_ARG_WITH(wxdebug,              [  --with-wxdebug               compiles wxWidgets with debuging options ])  AC_ARG_WITH(wxdebug,              [  --with-wxdebug          compiles wxWidgets with debuging options ])
 if test "$with_wxdebug" = "yes" ; then  if test "$with_wxdebug" = "yes" ; then
   with_wxdebug="yes"    with_wxdebug="yes"
 else  else
Line 270  fi Line 280  fi
   
 # it is possible to specify wxWidgets library path,  # it is possible to specify wxWidgets library path,
 # usefull for developpers who want to compile amaya with different wxWidgets version  # usefull for developpers who want to compile amaya with different wxWidgets version
 AC_ARG_WITH(wxsrcdir, [  --with-wxsrcdir=...               compiles Amaya with a specific wxWidgets sources path ])  AC_ARG_WITH(wxsrcdir, [  --with-wxsrcdir=...     compiles Amaya with a specific wxWidgets sources path ])
 if test "$with_wxsrcdir" = "" ; then  if test "$with_wxsrcdir" = "" ; then
   with_wxsrcdir="../../wxWidgets"    with_wxsrcdir="../../wxWidgets"
 fi  fi
Line 447  if test "$with_wx" = "yes" ; then Line 457  if test "$with_wx" = "yes" ; then
   fi    fi
   if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then    if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then
     # MACOSX      # MACOSX
     AC_MSG_ERROR(TODO: configurer wxWidgets pour MACOSX)      # AC_MSG_ERROR(TODO: configurer wxWidgets pour MACOSX)
     # --with-mac              use Mac OS X      # --with-mac              use Mac OS X
     # --with-cocoa            use Cocoa      WXCONFIGURE_OPTION="--with-opengl --disable-shared --enable-unicode"
     # WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode"  
   fi    fi
   if test $with_wxdebug = yes ; then    if test $with_wxdebug = yes ; then
     WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug"      WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug"
Line 521  dnl  *********************************** Line 530  dnl  ***********************************
   
 # if configure has option --with-graphiclibs then dont check for system graphic libs  # if configure has option --with-graphiclibs then dont check for system graphic libs
 # force amaya static graphic libs to be used  # force amaya static graphic libs to be used
 AC_ARG_WITH(graphiclibs, [  --with-graphiclibs     use static libjpeg, libpng.])  AC_ARG_WITH(graphiclibs, [  --with-graphiclibs      use static libjpeg, libpng.])
 if test "$with_graphiclibs" = "yes" -o "$enable_graphiclibs" = "yes" ; then  if test "$with_graphiclibs" = "yes" -o "$enable_graphiclibs" = "yes" ; then
   no_graphic="no"    no_graphic="no"
 else  else
Line 808  if test "$with_gl" = "yes" -o "$with_mes Line 817  if test "$with_gl" = "yes" -o "$with_mes
   fi    fi
   
   AC_MSG_CHECKING([Xft-library])    AC_MSG_CHECKING([Xft-library])
    
   if test "$with_mac" = "yes" ; then
     for ac_dir in                         \
                   /usr/lib                        \
                   /usr/X11R6/lib                  \
                   /opt/local/lib                  \
                   ; \
     do  if test -r "$ac_dir/libXft.2.dylib" ; then
       xft_lib="yes"
       XFT_LIBRARIES="-L$ac_dir -lXft"
       AC_MSG_RESULT([yes])
       break       
     fi
     done  
     if test "$xft_lib" = "" ; then
       AC_MSG_WARN(Xft.2 library (libXft.2.dylib) not found !!)
       AC_MSG_WARN(Disabling opengl build !)
         with_gl="no"
         exit 1;
     fi
   else
   for ac_dir in                         \    for ac_dir in                         \
                 /usr/lib                        \                  /usr/lib                        \
                 /usr/X11R6/lib                  \                  /usr/X11R6/lib                  \
Line 826  if test "$with_gl" = "yes" -o "$with_mes Line 856  if test "$with_gl" = "yes" -o "$with_mes
       with_gl="no"        with_gl="no"
       exit 1;        exit 1;
   fi    fi
   fi
   
   AC_SUBST(XFT_INCLUDES)    AC_SUBST(XFT_INCLUDES)
   AC_SUBST(XFT_LIBRARIES)    AC_SUBST(XFT_LIBRARIES)
   # END CHECKING XFT #    # END CHECKING XFT #
Removed from v.1.154  
changed lines
  Added in v.1.155

Webmaster