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

Diff for /Amaya/configure.in between versions 1.186 and 1.187

version 1.186, 2005/07/08 14:27:24 version 1.187, 2005/07/11 13:26:45
Line 231  if test "$with_gtk" = "yes" -o "$enable_ Line 231  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 canvas with software OpenGL implementation (Mesa) ])  AC_ARG_WITH(MESA,              [  --with-mesa             enable canvas with software OpenGL implementation (Mesa) ])
 if test "$with_mesa" = "" ; then  if test "$with_mesa" = "" ; then
Line 476  if test "$with_wx" = "yes" ; then Line 466  if test "$with_wx" = "yes" ; then
   fi    fi
   if test "$AMAYAOS" = "MACOSX" ; then    if test "$AMAYAOS" = "MACOSX" ; then
     # MACOSX      # MACOSX
     # AC_MSG_ERROR(TODO: configurer wxWidgets pour MACOSX)  
     # --with-mac              use Mac OS X  
       with_mac="yes"  
     WXCONFIGURE_OPTION="--with-opengl --disable-shared --enable-unicode --with-libpng=builtin --with-libjpeg=builtin"      WXCONFIGURE_OPTION="--with-opengl --disable-shared --enable-unicode --with-libpng=builtin --with-libjpeg=builtin"
   fi    fi
   if test $with_wxdebug = yes ; then    if test $with_wxdebug = yes ; then
Line 529  if test "$with_wx" = "yes" ; then Line 516  if test "$with_wx" = "yes" ; then
       WX_LIBRARIES_EXTRA_PARAM="-framework OpenGL -framework AGL"        WX_LIBRARIES_EXTRA_PARAM="-framework OpenGL -framework AGL"
     fi      fi
   fi    fi
  if test "$with_mac" = "yes" ; then   if test "$AMAYAOS" = "MACOSX" ; then
    WXCONFIG_LIBS_PARAM="${WXCONFIG_LIBS_PARAM},html"     WXCONFIG_LIBS_PARAM="${WXCONFIG_LIBS_PARAM},html"
  fi   fi
   
Line 801  if test "$with_gl" = "yes" -o "$with_mes Line 788  if test "$with_gl" = "yes" -o "$with_mes
     fi      fi
     fi # AMAYAOS = LINUX      fi # AMAYAOS = LINUX
   
     if test "$with_mac" = "yes" ; then      if test "$AMAYAOS" = "MACOSX" ; then
       GL_OPTIONS="-D_GL"                GL_OPTIONS="-D_GL"        
       GL_INCLUDES="-I/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/"             GL_INCLUDES="-I/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/"     
       GL_LIBRARIES=""        GL_LIBRARIES=""
Line 815  if test "$with_gl" = "yes" -o "$with_mes Line 802  if test "$with_gl" = "yes" -o "$with_mes
     AC_SUBST(GL_LIBRARIES)      AC_SUBST(GL_LIBRARIES)
   fi # if with_gl    fi # if with_gl
                   
   # check for gtkglarea.h only if gtk gui is selected    # ---------- Check for gtkglarea.h only if gtk gui is selected
   if test "$with_gtk" = "yes" ; then    if test "$with_gtk" = "yes" ; then
     AC_MSG_CHECKING([GTKGLAREA])      AC_MSG_CHECKING([GTKGLAREA])
     for ac_dir in                               \      for ac_dir in                               \
Line 849  if test "$with_gl" = "yes" -o "$with_mes Line 836  if test "$with_gl" = "yes" -o "$with_mes
     fi      fi
     AC_SUBST(GTK_GL_INCLUDES)      AC_SUBST(GTK_GL_INCLUDES)
     AC_SUBST(GTK_GL_LIBRARIES)      AC_SUBST(GTK_GL_LIBRARIES)
   fi    fi # "$with_gtk" = "yes"
   
   # checking for freetype lib (fonts library)    # ---------- Checking for freetype lib (fonts library)
   if test "$with_mac" = "yes" ; then    if test "$AMAYAOS" = "MACOSX" ; then
      # we use a static version of freetype lib for mac osx       # we use a static version of freetype lib for mac osx
      FREETYPE_INCLUDES="-I/opt/local/include -I/opt/local/include/freetype2 -I/usr/X11R6/include/freetype2/freetype"       # ** search for includes (freetype.h)
      FREETYPE_LIBRARIES="-lfreetype"       for ac_dir in               \
   else           /Developer/SDKs/MacOSX10.1.5.sdk/usr/X11R6/include/  \
            /Developer/SDKs/MacOSX10.1.5.sdk/usr/X11R6/include/freetype2/  \
            /Developer/SDKs/MacOSX10.2.8.sdk/usr/X11R6/include/  \
            /Developer/SDKs/MacOSX10.2.8.sdk/usr/X11R6/include/freetype2/  \
            /Developer/SDKs/MacOSX10.3.0.sdk/usr/X11R6/include/  \
            /Developer/SDKs/MacOSX10.3.0.sdk/usr/X11R6/include/freetype2/  \
            /Developer/SDKs/MacOSX10.3.9.sdk/usr/X11R6/include/  \
            /Developer/SDKs/MacOSX10.3.9.sdk/usr/X11R6/include/freetype2/  \
            /Developer/SDKs/MacOSX10.4.0.sdk/usr/X11R6/include/  \
            ; \
            do
            if test -r "$ac_dir/ft2build.h"; then
               FREETYPE_INCLUDES="${FREETYPE_INCLUDES} -I$ac_dir"
               break
            fi
        done
        # ** search for binary (libfreetype.a)
        for ac_dir in               \
            /Developer/SDKs/MacOSX10.1.5.sdk/usr/X11R6/lib/  \
            /Developer/SDKs/MacOSX10.2.8.sdk/usr/X11R6/lib/  \
            /Developer/SDKs/MacOSX10.3.0.sdk/usr/X11R6/lib/  \
            /Developer/SDKs/MacOSX10.3.9.sdk/usr/X11R6/lib/  \
            /Developer/SDKs/MacOSX10.4.0.sdk/usr/X11R6/lib/  \
            ; \
            do
            if test -r "$ac_dir/libfreetype.a"; then
               FREETYPE_LIBRARIES="$ac_dir"
               break
            fi
        done
     else # "$AMAYAOS" = "MACOSX"
      if test ! -f $(which freetype-config) ; then       if test ! -f $(which freetype-config) ; then
        AC_MSG_ERROR(Cannot find freetype library (font load/display routines). Please install it.)         AC_MSG_ERROR(Cannot find freetype library (font load/display routines). Please install it.)
      fi       fi
      FREETYPE_INCLUDES=`freetype-config --cflags`       FREETYPE_INCLUDES=`freetype-config --cflags`
      FREETYPE_LIBRARIES=`freetype-config --libs`       FREETYPE_LIBRARIES=`freetype-config --libs`
    fi    fi # "$AMAYAOS" = "MACOSX"
     AC_SUBST(FREETYPE_INCLUDES)    AC_SUBST(FREETYPE_INCLUDES)
     AC_SUBST(FREETYPE_LIBRARIES)    AC_SUBST(FREETYPE_LIBRARIES)
   
   
   
     # ----------- START CHECKING XFT
     # checking for Xft which is only used on GTK version (not wxWidgets)
   if test "$with_gtk" = "yes" ; then
   
   # checking for xft lib    # checking for xft lib
   # (not used because xft-config doesn't exist on debian stable)    # (not used because xft-config doesn't exist on debian stable)
   #if test ! -f $(which xft-config) ; then    #if test ! -f $(which xft-config) ; then
Line 877  if test "$with_gl" = "yes" -o "$with_mes Line 899  if test "$with_gl" = "yes" -o "$with_mes
   #AC_SUBST(XFT_INCLUDES)    #AC_SUBST(XFT_INCLUDES)
   #AC_SUBST(XFT_LIBRARIES)    #AC_SUBST(XFT_LIBRARIES)
   
   # START CHECKING XFT #  
   # checking for Xft (old way)  
 if test "$with_mac" = "no" ; then  
   AC_MSG_CHECKING([Xft])    AC_MSG_CHECKING([Xft])
   for ac_dir in                         \    for ac_dir in                         \
                 /usr/include                    \                  /usr/include                    \
Line 934  if test "$with_mac" = "no" ; then Line 953  if test "$with_mac" = "no" ; then
   AC_SUBST(XFT_INCLUDES)    AC_SUBST(XFT_INCLUDES)
   AC_SUBST(XFT_LIBRARIES)    AC_SUBST(XFT_LIBRARIES)
   # END CHECKING XFT #    # END CHECKING XFT #
 fi  fi # "$with_gtk" = "yes"
   
   
   AC_MSG_CHECKING([gcc3])           AC_MSG_CHECKING([gcc3])       
Line 1281  EXTRA_INCLUDES= Line 1300  EXTRA_INCLUDES=
   
 # check for malloc.h  # check for malloc.h
 # on macosx, this file is not at the right place  # on macosx, this file is not at the right place
 if test "$with_mac" = "yes" ; then  if test "$AMAYAOS" = "MACOSX" ; then
 for ac_dir in               \  for ac_dir in               \
   /Developer/SDKs/MacOSX10.1.5.sdk/usr/include/objc/   \    /Developer/SDKs/MacOSX10.1.5.sdk/usr/include/objc/   \
   /Developer/SDKs/MacOSX10.1.5.sdk/usr/include/sys/    \    /Developer/SDKs/MacOSX10.1.5.sdk/usr/include/sys/    \
Line 1297  do Line 1316  do
     break      break
   fi    fi
 done  done
 else  else # "$AMAYAOS" = "MACOSX"
 for ac_dir in               \  for ac_dir in               \
   /usr/include/malloc/      \    /usr/include/malloc/      \
   /sw/include/malloc/       \    /sw/include/malloc/       \
Line 1309  do Line 1328  do
     break      break
   fi    fi
 done  done
 fi  fi # "$AMAYAOS" = "MACOSX"
   
 dnl  dnl
 dnl Set up the PATHs needed  dnl Set up the PATHs needed
Removed from v.1.186  
changed lines
  Added in v.1.187

Webmaster