[BACK] Return to configure.in CVS log [TXT][DIR] Up to Nevrax / code / snowballs2

Diff for /code/snowballs2/configure.in between version 1.3 and 1.4

version 1.3, 2001/07/23 13:30:41 version 1.4, 2001/08/07 14:19:53
Line 12 
Line 12 
 AC_INIT(client/src/client.cpp) AC_INIT(client/src/client.cpp)
  
 MAJOR_VERSION=0 MAJOR_VERSION=0
 MINOR_VERSION=1 MINOR_VERSION=2
 PICO_VERSION=0 PICO_VERSION=0
  
 AM_INIT_AUTOMAKE(snowballs, $MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION) AM_INIT_AUTOMAKE(snowballs, $MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION)
Line 35 
Line 35 
 AC_ARG_ENABLE( client, AC_ARG_ENABLE( client,
     [  --disable-client        disable compilation and install of Snowballs Client.],     [  --disable-client        disable compilation and install of Snowballs Client.],
     [ AC_MSG_RESULT(disable Snowballs Client.) ],     [ AC_MSG_RESULT(disable Snowballs Client.) ],
     [ SNO_SUBDIRS="$SNO_SUBDIRS client" ] )     [ SNO_SUBDIRS="$SNO_SUBDIRS client"
        enable_client=yes ] )
  
 dnl Server dnl Server
 AC_ARG_ENABLE( server, AC_ARG_ENABLE( server,
     [  --disable-server        disable compilation and install of Snowballs Server.],     [  --disable-server        disable compilation and install of Snowballs Server.],
     [ AC_MSG_RESULT(disable Snowballs Server.) ],     [ AC_MSG_RESULT(disable Snowballs Server.) ],
     [ SNO_SUBDIRS="$SNO_SUBDIRS server" ] )     [ SNO_SUBDIRS="$SNO_SUBDIRS server"
        enable_server=yes ] )
  
 AC_SUBST(SNO_SUBDIRS) AC_SUBST(SNO_SUBDIRS)
  
Line 95 
Line 97 
         CXXFLAGS="$CXXFLAGS -I$x_includes"         CXXFLAGS="$CXXFLAGS -I$x_includes"
     fi     fi
 else else
      if test "$enable_client" = "yes"
      then
     AC_MSG_ERROR(X11 must be installed.)     AC_MSG_ERROR(X11 must be installed.)
 fi fi
  fi
  
  
 dnl ========================================================================== dnl ==========================================================================
 dnl STLPort dnl STLPort
  
 dnl Ask user for path to the STLport header files dnl Ask user for path to the STLport files location
 AC_ARG_WITH( stlport, AC_ARG_WITH( stlport,
     [  --with-stlport=<path>   path to the STLPort header files directory.     [  --with-stlport=<path>   path to the STLPort install files directory.
                           e.g. /usr/local/include/stlport ],                           e.g. /usr/local/stlport]
     [ STLPORT_DIR=$with_stlport 
       AC_MSG_RESULT(using STLPort header files located in $with_stlport) ], 
       AC_MSG_ERROR([You must call configure with the --with-stlport option. 
     This tells configure where to find the STLPort header files. 
     e.g. --with-stlport=/usr/local/include/stlport]) 
 ) )
  
 if test X"$STLPORT_DIR" != X""; AC_ARG_WITH( stlport-include,
 then     [  --with-stlport-include=<path>
     CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS"                           path to the STLPort header files directory.
 fi                           e.g. /usr/local/stlport/include]
  )                        
  
 dnl Ask user for path to the STLPort library files AC_ARG_WITH( stlport-lib,
 AC_ARG_WITH( stllib,     [  --with-stlport-lib=<path>
     [  --with-stllib=<path>    path to the STLPort installation directory.                           path to the STLPort library files directory.
                           e.g. /usr/local/lib/stlport],                           e.g. /usr/local/stlport/lib]
     [ STLLIB_DIR=$with_stllib 
       AC_MSG_RESULT(using STLPort library located in $with_stllib) ] 
 ) )
  
 if test X"$STLLIB_DIR" != X""; if test "$with_stlport" != "no"
  then
      if test -z "$with_stlport" && test -z "$with_stlport_lib" -o -z "$with_stlport_include"
 then then
     LIBS="-L$STLLIB_DIR $LIBS"         AC_MSG_ERROR([You must call configure with the --with-stlport or --with-stlport-lib and with-stlport-include options.
  This tells configure where to find the STLPort files.])
 fi fi
  
 LIBS="$LIBS -lstlport_gcc"     if test $with_stlport
      then
          AC_MSG_RESULT(using STLPort files located in $with_stlport)
  
 _CPPFLAGS="$CPPFLAGS"         STLPORT_CFLAGS="$with_stlport/include"
 CPPFLAGS="$CXXFLAGS"         STLPORT_LIB="$with_stlport/lib"
      fi
  else
      no_stlport="no"
      AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)
  fi
  
 AC_MSG_CHECKING(for STLPort) if test -z "$no_stlport" -a "$with_stlport_include"
 AC_EGREP_CPP( yo_stlport, then
 [#include <algorithm>     AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)
 #ifdef __SGI_STL_PORT     STLPORT_CFLAGS="$with_stlport_include"
    yo_stlport fi
 #endif], 
 [ AC_MSG_RESULT(yes)], 
   AC_MSG_ERROR([STLPort is needed to compile the client (www.stlport.org)]) 
 ) 
  
 CPPFLAGS="$_CPPFLAGS" if test -z "$no_stlport" -a  "$with_stlport_lib"
  then
      AC_MSG_RESULT(using STLPort library files located in $with_stlport_lib)
      STLPORT_LIB="$with_stlport_lib"
  fi
  
  
 dnl ========================================================================== dnl ==========================================================================
Line 177 
Line 186 
 dnl Check for the FreeType 2 library files dnl Check for the FreeType 2 library files
 AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
  
 if test "$FREETYPE_CONFIG" = "no"; then if test "$FREETYPE_CONFIG" = "no" -a "$enable_client" = "yes"
  then
     AC_MSG_ERROR([Cannot find freetype-config: check your path.     AC_MSG_ERROR([Cannot find freetype-config: check your path.
     FreeType 2 library is needed to compile NeL (freetype.sourceforge.net).])     FreeType 2 library is needed to compile Snowballs (freetype.sourceforge.net).])
 else else
     FREETYPE_CFLAGS=`freetype-config --cflags`     FREETYPE_CFLAGS=`freetype-config --cflags`
     FREETYPE_LIBS=`freetype-config --libs`     FREETYPE_LIBS=`freetype-config --libs`
Line 199 
Line 209 
    yo_freetype2    yo_freetype2
 #endif], #endif],
 [ AC_MSG_RESULT(yes)], [ AC_MSG_RESULT(yes)],
   AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (freetype.sourceforge.net).])   if test "$enable_client" = "yes"
    then
        AC_MSG_ERROR([Freetype 2 library is needed to compile Snowballs (freetype.sourceforge.net).])
    else
        AC_MSG_RESULT(no)
    fi
 ) )
  
 CPPFLAGS="$_CPPFLAGS" CPPFLAGS="$_CPPFLAGS"
Line 259 
Line 274 
  
 dnl ========================================================================== dnl ==========================================================================
 dnl Checks for libraries. dnl Checks for libraries.
  dnl ==========================================================================
  
  dnl ==========================================================================
  dnl STLPort
  
  if test -z "$no_stlport"
  then
  
      if test X"$STLPORT_CFLAGS" != X
      then
          CXXFLAGS="-I$STLPORT_CFLAGS $CXXFLAGS"
      fi
  
      if test X"$STLPORT_LIB" != X
      then
          LIBS="-L$STLPORT_LIB $LIBS -lstlport_gcc"
      fi
  
      _CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CXXFLAGS $STLPORT_CFLAGS"
  
      AC_MSG_CHECKING(for STLPort)
      AC_EGREP_CPP( yo_stlport,
      [#include <algorithm>
  #ifdef __SGI_STL_PORT
     yo_stlport
  #endif],
      [ AC_MSG_RESULT(yes)],
        AC_MSG_ERROR([STLPort is needed to compile Snowballs (www.stlport.org).]) )
  
        CPPFLAGS="$_CPPFLAGS"
  fi
  
  
 dnl ========================================================================== dnl ==========================================================================
 dnl Checks for library functions. dnl Checks for library functions.
  dnl ==========================================================================
  
  
 dnl ========================================================================== dnl ==========================================================================
 dnl Output files to generate. dnl Output files to generate.
  dnl ==========================================================================
  
 AC_OUTPUT( Makefile                                         \ AC_OUTPUT( Makefile                                         \
            client/Makefile                                  \            client/Makefile                                  \

Legend:
Removed from v.1.3 
changed lines
 Added in v.1.4