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

Diff for /code/nel/configure.in between version 1.33 and 1.37

version 1.33, 2001/04/10 14:22:58 version 1.37, 2001/06/13 18:05:00
Line 10 
Line 10 
  
  
 dnl MAJOR_VERSION correspond to the CURRENT interface number. dnl MAJOR_VERSION correspond to the CURRENT interface number.
 dnl MINOR_VERSION correspond to the interface's REVISION (implementation) dnl MINOR_VERSION correspond to the interface REVISION (implementation)
 dnl               number. dnl               number.
 dnl PICO_VERSION correspond to the interface's AGE, which is the number dnl PICO_VERSION correspond to the interface AGE, which is the number
 dnl              of previous additional interfaces supported by this library. dnl              of previous additional interfaces supported by this library.
 dnl              It must be less than or equal to CURRENT. dnl              It must be less than or equal to CURRENT.
  
Line 20 
Line 20 
 MINOR_VERSION=3 MINOR_VERSION=3
 PICO_VERSION=0 PICO_VERSION=0
  
 AM_INIT_AUTOMAKE(nel,$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION) VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION
  
  AM_INIT_AUTOMAKE(nel,$VERSION)
  
 LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:$PICO_VERSION LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:$PICO_VERSION
  
  AC_SUBST(VERSION)
 AC_SUBST(LIBTOOL_VERSION) AC_SUBST(LIBTOOL_VERSION)
  
 AM_CONFIG_HEADER(include/nelconfig.h) AM_CONFIG_HEADER(include/nelconfig.h)
  
  
 dnl The following hack should ensure that configure doesn't add optimizing dnl The following hack should ensure that configure doesnt add optimizing
 dnl or debugging flags to CFLAGS or CXXFLAGS dnl or debugging flags to CFLAGS or CXXFLAGS
 CFLAGS="$CFLAGS " CFLAGS="$CFLAGS "
 CXXFLAGS="$CXXFLAGS " CXXFLAGS="$CXXFLAGS "
  
  
 dnl ==================================================================== dnl ====================================================================
  dnl Checks NeL modules (net, 3d, ai) to install / Disable
  
  dnl the misc is mandatory, it is use by the other modules.
  NEL_SUBDIRS="misc"
  
  dnl Network library
  AC_ARG_ENABLE( network,
      [  --disable-network       disable compilation and install of NeL Network.],
      [ AC_MSG_RESULT(disable NEL Network.) ],
      [ NEL_SUBDIRS="$NEL_SUBDIRS net" ] )
  
  dnl 3D library
  AC_ARG_ENABLE( 3d,
      [  --disable-3d            disable compilation and install of NeL 3D.],
      [ AC_MSG_RESULT(disable NEL 3D.) ],
      [ NEL_SUBDIRS="$NEL_SUBDIRS 3d" ] )
  
  dnl AI library
  AC_ARG_ENABLE( ai,
      [  --disable-ai            disable compilation and install of NeL AI.],
      [ AC_MSG_RESULT(disable NEL AI.) ],
      [ NEL_SUBDIRS="$NEL_SUBDIRS ai" ] )
  
  AC_SUBST(NEL_SUBDIRS)
  
  
  dnl ====================================================================
 dnl Checks for programs. dnl Checks for programs.
  
 AC_PROG_MAKE_SET AC_PROG_MAKE_SET
Line 100 
Line 130 
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
  
 dnl Supress GCC's "multi-character character constant" warnings. dnl Supress GCC "multi-character character constant" warnings.
 if test "X$CC" = "Xgcc"; if test "X$CC" = "Xgcc";
 then then
         CXXFLAGS="$CXXFLAGS -Wno-multichar"         CXXFLAGS="$CXXFLAGS -Wno-multichar"
Line 220 
Line 250 
 fi fi
 AC_ARG_WITH(debug, AC_ARG_WITH(debug,
     [  --with-debug[=full]     Build a debug version (huge libraries)     [  --with-debug[=full]     Build a debug version (huge libraries)
   --without-debug         Build withoug debugging code (default)],   --without-debug         Build without debugging code (default)],
     [with_debug=$withval],     [with_debug=$withval],
     [with_debug=no])     [with_debug=no])
 if test "$with_debug" = "yes" if test "$with_debug" = "yes"
Line 307 
Line 337 
    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 (www.stlport.org).]) AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (freetype.sourceforge.net).])
 ) )
  
 CPPFLAGS="$_CPPFLAGS" CPPFLAGS="$_CPPFLAGS"
Line 342 
Line 372 
 ) )
  
  
  dnl ============================================
  dnl Check for XF86VidMode extension (-lXxf86vm)
  dnl ============================================
  AC_MSG_CHECKING("for XF86VidMode extension")
  AC_ARG_WITH( xf86vidmode,
      [  --with-xf86vidmode=<path>
                            path to the XF86VidMode lib.
                            e.g. /usr/X11R6/lib],
      [VMLIB_DIR=$with_xf86vidmode
        AC_MSG_RESULT(using VidMode library located in $with_xf86vidmode.)],
      AC_MSG_RESULT(Compiling without Xf86VidMode and hence fullscreen support to compile with XF86VidMode support, use --with-xf86vidmode=<pathtolib>)
  )
  
  if test X"$VMLIB_DIR" != X;
  then
      LIBS="-L$VMLIB_DIR -lXxf86vm $LIBS";
      CXXFLAGS="$CXXFLAGS -DXF86VIDMODE";
  fi
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for library functions. dnl Checks for library functions.
  
Line 356 
Line 406 
  
 AC_OUTPUT( Makefile                       \ AC_OUTPUT( Makefile                       \
            include/Makefile               \            include/Makefile               \
             include/nel/Makefile              \
             include/nel/misc/Makefile         \
             include/nel/net/Makefile          \
             include/nel/3d/Makefile           \
             include/nel/3d/tmp/Makefile       \
             include/nel/ai/Makefile           \
             include/nel/ai/agent/Makefile     \
             include/nel/ai/c/Makefile         \
             include/nel/ai/character/Makefile \
             include/nel/ai/e/Makefile         \
             include/nel/ai/fuzzy/Makefile     \
             include/nel/ai/logic/Makefile     \
             include/nel/ai/nimat/Makefile     \
             include/nel/ai/pyserver/Makefile  \
             include/nel/ai/script/Makefile    \
             include/nel/ai/tools/Makefile     \
            src/Makefile                   \            src/Makefile                   \
            src/misc/Makefile              \            src/misc/Makefile              \
            src/misc/config_file/Makefile  \            src/misc/config_file/Makefile  \
Line 373 
Line 439 
            src/ai/pyserver/Makefile       \            src/ai/pyserver/Makefile       \
            src/ai/script/Makefile         \            src/ai/script/Makefile         \
            src/ai/tools/Makefile          \            src/ai/tools/Makefile          \
             nel-config                        \
  )
  
  
 dnl End of configure.in dnl End of configure.in


Legend:
Removed from v.1.33 
changed lines
 Added in v.1.37