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

Diff for /np2/x11/configure.ac between versions 1.4 and 1.9

version 1.4, 2011/12/22 16:13:58 version 1.9, 2011/12/24 02:15:40
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, nonakap@gmail.com, xnp2)  AC_INIT(Xnp2, 0.83-20111223, 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 21  AC_PROG_RANLIB Line 21  AC_PROG_RANLIB
 AC_PROG_INSTALL  AC_PROG_INSTALL
   
 dnl  dnl
 dnl Checks for libraries.  
 dnl  
 AC_PATH_XTRA  
   
 dnl  
 dnl Checks for header files.  dnl Checks for header files.
 dnl  dnl
 AC_STDC_HEADERS  AC_STDC_HEADERS
Line 72  AC_CHECK_FUNCS(pow,,AC_CHECK_LIB(m,pow)) Line 67  AC_CHECK_FUNCS(pow,,AC_CHECK_LIB(m,pow))
 AC_CHECK_FUNCS(sqrt,,AC_CHECK_LIB(m,sqrt))  AC_CHECK_FUNCS(sqrt,,AC_CHECK_LIB(m,sqrt))
   
 dnl  dnl
   dnl Checks for X
   dnl
   AC_PATH_XTRA
   if test x"$no_x" != x"yes"; then
           X_LIBS="$X_LIBS -lX11"
   fi
   
   dnl
 dnl Xnp2 configure options.  dnl Xnp2 configure options.
 dnl  dnl
 AC_ARG_ENABLE(ia32,  
         AC_HELP_STRING([--enable-ia32],[Use IA-32 emulation [[default=no]]]),,  
         [enable_ia32="no"])  
 AC_ARG_ENABLE(xf86vidmode,  
         AC_HELP_STRING([--enable-xf86vidmode],[Use XF86VidMode extension [[default=yes]]]),,  
         [enable_xf86vidmode="yes"])  
 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_HELP_STRING([--enable-xf86vidmode],[Use XF86VidMode extension [[default=yes]]]),,
           [enable_xf86vidmode="yes"])
   AC_ARG_ENABLE(ia32,
           AC_HELP_STRING([--enable-ia32],[Use IA-32 emulation [[default=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"])
   
 dnl  dnl
 dnl Checks for IA-32 CPU emulation  
 dnl  
 AM_CONDITIONAL(CPUCORE_IA32, test x"$enable_ia32" = "xyes")  
   
 dnl  
 dnl Checks for XF86VidMode extension  
 dnl  
 if test x"$enable_xf86vidmode" = "xyes"; then  
         AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,  
                 X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm"  
                 AC_DEFINE(HAVE_XF86VIDMODE,1,[Define to 1 if you have the libXxf86vm library.]),  
                 ,  
                 $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)  
 fi  
   
 dnl  
 dnl Checks for GTK+  dnl Checks for GTK+
 dnl  dnl
 AM_PATH_GTK_2_0(2.6.0,,  AM_PATH_GTK_2_0(2.6.0,,
Line 140  if test x"$enable_sdlmixer" = "xyes"; th Line 127  if test x"$enable_sdlmixer" = "xyes"; th
 fi  fi
   
 dnl  dnl
   dnl Checks for XF86VidMode extension
   dnl
   if test x"$enable_xf86vidmode" = "xyes"; then
           AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
                   X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm"
                   AC_DEFINE(HAVE_XF86VIDMODE,1,[Define to 1 if you have the libXxf86vm library.]),
                   ,
                   $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS)
   fi
   
   dnl
   dnl Checks for IA-32 CPU emulation
   dnl
   AM_CONDITIONAL(CPUCORE_IA32, test x"$enable_ia32" = "xyes")
   
   dnl
 dnl Checks for debug mode  dnl Checks for debug mode
 dnl  dnl
 AC_MSG_CHECKING([whether to enable debugging])  AC_MSG_CHECKING([whether to enable debugging])
Line 148  if test x"$enable_debug" = "xyes"; then Line 151  if test x"$enable_debug" = "xyes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align"          CFLAGS="$CFLAGS -Wall -Wcast-align"
         CFLAGS="$CFLAGS -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"          CFLAGS="$CFLAGS -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
         CFLAGS="$CFLAGS -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"          CFLAGS="$CFLAGS -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
           CFLAGS="$CFLAGS -Wstack-protector -fstack-protector --param ssp-buffer-size=1"
 else  else
         CFLAGS="$CFLAGS -DNDEBUG"          CFLAGS="$CFLAGS -DNDEBUG"
 fi  fi
Removed from v.1.4  
changed lines
  Added in v.1.9

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