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

Diff for /Amaya/configure.in between versions 1.173 and 1.174

version 1.173, 2005/03/30 17:37:04 version 1.174, 2005/04/05 16:24:00
Line 751  if test "$with_gl" = "yes" -o "$with_mes Line 751  if test "$with_gl" = "yes" -o "$with_mes
         done          done
         LDFLAGS=$LDFLAGS_OLD          LDFLAGS=$LDFLAGS_OLD
         LIBS=$LIBS_OLD          LIBS=$LIBS_OLD
   if test "$with_mac" = "yes" ; then  
       GL_OPTIONS=""       
       GL_INCLUDES="-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/"     
       GL_LIBRARIES=""  
   else  
     if test "$gl_inc" = "" ; then                     if test "$gl_inc" = "" ; then               
       AC_MSG_WARN(Opengl headers (gl.h) not found !!)        AC_MSG_WARN(Opengl headers (gl.h) not found !!)
       AC_MSG_WARN(Disabling opengl build !)        AC_MSG_WARN(Disabling opengl build !)
Line 776  if test "$with_gl" = "yes" -o "$with_mes Line 772  if test "$with_gl" = "yes" -o "$with_mes
       GL_LIBRARIES=        GL_LIBRARIES=
       exit 1;        exit 1;
     fi      fi
   
       if test "$with_mac" = "yes" ; then
         GL_OPTIONS="-D_GL"        
         GL_INCLUDES="-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/"   
         GL_LIBRARIES=""
       else
         GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lGL -lGLU"
         GL_OPTIONS="-D_GL"
     fi      fi
       
     GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lGL -lGLU"  
     GL_OPTIONS="-D_GL"  
   
     AC_SUBST(GL_INCLUDES)      AC_SUBST(GL_INCLUDES)
     AC_SUBST(GL_LIBRARIES)      AC_SUBST(GL_LIBRARIES)
Line 824  if test "$with_gl" = "yes" -o "$with_mes Line 825  if test "$with_gl" = "yes" -o "$with_mes
   # checking for freetype lib (fonts library)    # checking for freetype lib (fonts library)
   if test "$with_mac" = "yes" ; then    if test "$with_mac" = "yes" ; 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=""       FREETYPE_INCLUDES="-I/opt/local/include -I/opt/local/include/freetype2 -I/usr/X11R6/include/freetype2/freetype"
      FREETYPE_LIBRARIES=""       FREETYPE_LIBRARIES="-lfreetype"
   else    else
      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.)
Removed from v.1.173  
changed lines
  Added in v.1.174

Webmaster