[BACK]Return to configure.ac CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/configure.ac between versions 1.15 and 1.34

version 1.15, 2011/12/29 13:36:26 version 1.34, 2012/02/07 09:43:12
Line 6  dnl require autoconf 2.59 Line 6  dnl require autoconf 2.59
 AC_PREREQ(2.59)  AC_PREREQ(2.59)
 AC_REVISION($Revision$)  AC_REVISION($Revision$)
   
 AC_INIT(Xnp2,0.83-20111224,nonakap@gmail.com,xnp2)  AC_INIT(Xnp2,0.83-20120207,nonakap@gmail.com,xnp2)
 AM_INIT_AUTOMAKE([no-define no-dist no-installinfo subdir-objects])  AM_INIT_AUTOMAKE([no-define no-dist no-installinfo subdir-objects])
 AC_CONFIG_SRCDIR([../np2ver.h])  AC_CONFIG_SRCDIR([../np2ver.h])
 AC_CONFIG_HEADERS(config.h)  AC_CONFIG_HEADERS(config.h)
Line 42  AC_STRUCT_TM Line 42  AC_STRUCT_TM
 AC_C_VOLATILE  AC_C_VOLATILE
 AC_CHECK_TYPES([ptrdiff_t])  AC_CHECK_TYPES([ptrdiff_t])
 AC_SYS_LARGEFILE  AC_SYS_LARGEFILE
   AC_C_CHAR_UNSIGNED
   
 dnl  dnl
 dnl Check GCC  dnl Check GCC
 dnl  dnl
 if test x"$GCC" != "xyes"; then  AM_CONDITIONAL(HAVE_GCC,test x"$GCC" = "xyes")
     AC_MSG_ERROR(This package required GCC.)  
 fi  
   
 dnl  dnl
 dnl Checks for library functions.  dnl Checks for library functions.
Line 83  dnl Line 82  dnl
 dnl Xnp2 configure options.  dnl Xnp2 configure options.
 dnl  dnl
 AC_ARG_ENABLE(sdl,  AC_ARG_ENABLE(sdl,
   AC_HELP_STRING([--enable-sdl],[Use SDL library [[default=yes]]]),,    AC_HELP_STRING([--enable-sdl],[Use SDL library [default=yes]]),,
   [enable_sdl="yes"])    [enable_sdl="yes"])
 AC_ARG_ENABLE(sdlmixer,  AC_ARG_ENABLE(sdlmixer,
   AC_HELP_STRING([--enable-sdlmixer],[Use SDL_mixer library [[default=yes]]]),,    AC_HELP_STRING([--enable-sdlmixer],[Use SDL_mixer library [default=yes]]),,
   [enable_sdlmixer="yes"])    [enable_sdlmixer="yes"])
 AC_ARG_ENABLE(xf86vidmode,  AC_ARG_ENABLE(xf86vidmode,
   AC_HELP_STRING([--enable-xf86vidmode],[Use XF86VidMode extension [[default=yes]]]),,    AC_HELP_STRING([--enable-xf86vidmode],[Use XF86VidMode extension [default=yes]]),,
   [enable_xf86vidmode="yes"])    [enable_xf86vidmode="yes"])
 AC_ARG_ENABLE(ia32,  AC_ARG_ENABLE(ia32,
   AC_HELP_STRING([--enable-ia32],[Use IA-32 emulation [[default=no]]]),,    AC_HELP_STRING([--enable-ia32],[Use IA-32 emulation [default=no]]),,
   [enable_ia32="no"])    [enable_ia32="no"])
 AC_ARG_ENABLE(debug,  AC_ARG_ENABLE(debug,
   AC_HELP_STRING([--enable-debug],[Enable debugging [[default=no]]]),,    AC_HELP_STRING([--enable-debug],[Enable debugging [default=no]]),,
   [enable_debug="no"])    [enable_debug="no"])
 AC_ARG_ENABLE(warning,  AC_ARG_ENABLE(warning,
   AC_HELP_STRING([--enable-warning],[Enable warning [[default=no]]]),,    AC_HELP_STRING([--enable-warning],[Enable warning [default=no]]),,
   [enable_warning="no"])    [enable_warning="no"])
   
 dnl  dnl
Line 111  AC_SUBST(GTK_LIBS) Line 110  AC_SUBST(GTK_LIBS)
 AC_DEFINE(USE_GTK2,1,[Define to 1 if you have the GTK+-2 library.])  AC_DEFINE(USE_GTK2,1,[Define to 1 if you have the GTK+-2 library.])
   
 dnl  dnl
 dnl Checks for SDL  dnl Checks for SDL and SDL_mixer
 dnl  dnl
 if test x"$enable_sdlmixer" = "xyes"; then  if test x"$enable_sdl" = "xyes"; then
   AM_PATH_SDL(1.2.0)    AM_PATH_SDL(1.2.0)
   if test x"$no_sdl" != "xyes"; then    if test x"$no_sdl" != "xyes"; then
     AC_DEFINE(USE_SDLAUDIO,,[Define if you have the SDL library.])      AC_DEFINE(USE_SDLAUDIO,,[Define if you have the SDL library.])
       if test x"$enable_sdlmixer" = "xyes"; then
         AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,
           AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])
           SDL_LIBS="$SDL_LIBS -lSDL_mixer",,$SDL_LIBS)
       fi
   fi    fi
 fi  fi
   
 dnl  
 dnl Checks for SDL_mixer  
 dnl  
 if test x"$enable_sdlmixer" = "xyes"; then  
   if test x"$no_sdl" != "xyes"; then  
     AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,  
       AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])  
       SDL_LIBS="$SDL_LIBS -lSDL_mixer",,$SDL_LIBS)  
   fi  
 fi  
   
 dnl  dnl
 dnl Checks for XF86VidMode extension  dnl Checks for XF86VidMode extension
Line 150  if test x"$enable_xf86vidmode" = "xyes"; Line 144  if test x"$enable_xf86vidmode" = "xyes";
 fi  fi
   
 dnl  dnl
   dnl Checks for nasm
   dnl
   AC_CHECK_PROGS(nasm,[nasm nasmw],no)
   
   dnl
 dnl Checks for IA-32 CPU emulation  dnl Checks for IA-32 CPU emulation
 dnl  dnl
 AC_MSG_CHECKING([whether to use IA-32 emulation])  AC_MSG_CHECKING([whether to use IA-32 emulation])
Line 164  dnl Checks for debug mode Line 163  dnl Checks for debug mode
 dnl  dnl
 AC_MSG_CHECKING([whether to enable debugging])  AC_MSG_CHECKING([whether to enable debugging])
 if test x"$enable_debug" = "xyes"; then  if test x"$enable_debug" = "xyes"; then
   CFLAGS="$CFLAGS -DDEBUG -g -O0"    CFLAGS="$CFLAGS -g -DDEBUG -DTRACE"
   CFLAGS="$CFLAGS -Wstack-protector -fstack-protector --param ssp-buffer-size=1"    CFLAGS="$CFLAGS -Wstack-protector -fstack-protector --param ssp-buffer-size=1"
   enable_warning=yes    enable_warning=yes
 else  else
Line 177  dnl Checks for warning Line 176  dnl Checks for warning
 dnl  dnl
 AC_MSG_CHECKING([whether to enable warning])  AC_MSG_CHECKING([whether to enable warning])
 if test x"$enable_warning" = "xyes"; then  if test x"$enable_warning" = "xyes"; then
   CFLAGS="$CFLAGS -Wall -Wcast-align"    CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith"
   CFLAGS="$CFLAGS -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"    CFLAGS="$CFLAGS -Wreturn-type -Wswitch -Wshadow"
   CFLAGS="$CFLAGS -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"    CFLAGS="$CFLAGS -Wcast-qual -Wwrite-strings"
     CFLAGS="$CFLAGS -Wextra -Wno-unused-parameter"
     CFLAGS="$CFLAGS -Wformat=2"
 fi  fi
 AC_MSG_RESULT($enable_warning)  AC_MSG_RESULT($enable_warning)
   
Removed from v.1.15  
changed lines
  Added in v.1.34

RetroPC.NET-CVS <cvs@retropc.net>