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

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

version 1.1, 2011/12/16 10:32:08 version 1.15, 2011/12/29 13:36:26
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, aw9k-nnk@asahi-net.or.jp, xnp2)  AC_INIT(Xnp2,0.83-20111224,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 17  dnl Checks for programs. Line 17  dnl Checks for programs.
 dnl  dnl
 AC_PROG_CC  AC_PROG_CC
 AM_PROG_CC_C_O  AM_PROG_CC_C_O
   AC_PROG_GCC_TRADITIONAL
 AC_PROG_RANLIB  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 45  AC_HEADER_TIME Line 41  AC_HEADER_TIME
 AC_STRUCT_TM  AC_STRUCT_TM
 AC_C_VOLATILE  AC_C_VOLATILE
 AC_CHECK_TYPES([ptrdiff_t])  AC_CHECK_TYPES([ptrdiff_t])
   AC_SYS_LARGEFILE
   
 dnl  dnl
 dnl Check GCC  dnl Check GCC
Line 57  dnl Line 54  dnl
 dnl Checks for library functions.  dnl Checks for library functions.
 dnl  dnl
 AC_FUNC_CLOSEDIR_VOID  AC_FUNC_CLOSEDIR_VOID
 AC_PROG_GCC_TRADITIONAL  
 AC_FUNC_MALLOC  AC_FUNC_MALLOC
 AC_FUNC_MEMCMP  AC_FUNC_MEMCMP
 AC_FUNC_STAT  AC_FUNC_STAT
Line 72  AC_CHECK_FUNCS(pow,,AC_CHECK_LIB(m,pow)) Line 68  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_X
   AC_PATH_XTRA
   AC_SUBST(XLIB,"")
   if test x"$no_x" != x"yes"; then
     XLIB="-lX11"
   elif test x"$have_x" = x"no"; then
     PKG_CHECK_MODULES([X],[x11 xext],[have_x=yes;no_x=no],[have_x=no;no_x=yes])
   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_HELP_STRING([--enable-debug],[Enable debugging [[default=no]]]),,
     [enable_debug="no"])
   AC_ARG_ENABLE(warning,
     AC_HELP_STRING([--enable-warning],[Enable warning [[default=no]]]),,
     [enable_warning="no"])
   
 dnl  dnl
 dnl Checks for IA-32 CPU emulation  dnl Checks for GTK+
 dnl  dnl
 AM_CONDITIONAL(CPUCORE_IA32, test x"$enable_ia32" = "xyes")  AM_PATH_GTK_2_0(2.6.0,,
     AC_MSG_ERROR(Test for GTK failed. See the file 'x11/INSTALL.ja' for help))
   AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
   AC_DEFINE(USE_GTK2,1,[Define to 1 if you have the GTK+-2 library.])
   
   dnl
   dnl Checks for SDL
   dnl
   if test x"$enable_sdlmixer" = "xyes"; then
     AM_PATH_SDL(1.2.0)
     if test x"$no_sdl" != "xyes"; then
       AC_DEFINE(USE_SDLAUDIO,,[Define if you have the SDL library.])
     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
 dnl  dnl
 if test x"$enable_xf86vidmode" = "xyes"; then  if test x"$enable_xf86vidmode" = "xyes"; then
         AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,    ac_cv_save_cflags=$CFLAGS
                 X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm"    CFLAGS="$CFLAGS $X_CFLAGS"
                 AC_DEFINE(HAVE_XF86VIDMODE,1,[Define to 1 if you have the libXxf86vm library.]),    AC_CHECK_LIB(Xext,XextCreateExtension,
                 ,      XLIB="-lXext $XLIB",,[$X_LIBS $X_PRE_LIBS $XLIB $X_EXTRA_LIBS])
                 $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)    AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,
       [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 $XLIB $X_EXTRA_LIBS)],
       ,
       [#include <X11/Xlib.h>])
     CFLAGS=$ac_cv_save_cflags
 fi  fi
   
 dnl  dnl
 dnl Checks for GTK+  dnl Checks for IA-32 CPU emulation
 dnl  dnl
 AM_PATH_GTK_2_0(2.6.0,,  AC_MSG_CHECKING([whether to use IA-32 emulation])
     AC_MSG_ERROR(Test for GTK failed. See the file 'x11/INSTALL.ja' for help))  AM_CONDITIONAL(CPUCORE_IA32,test x"$enable_ia32" = "xyes")
 AC_SUBST(GTK_CFLAGS)  if test x"$enable_ia32" = "xyes"; then
 AC_SUBST(GTK_LIBS)    AC_DEFINE(CPUCORE_IA32,,[Define if use IA-32 emulation])
 if test x"$no_gtk" != "xyes"; then  
         AC_DEFINE(USE_GTK2,1,[Define to 1 if you have the GTK+-2.6 (or later) library.])  
 fi  fi
   AC_MSG_RESULT($enable_ia32)
   
 dnl  dnl
 dnl Checks for SDL  dnl Checks for debug mode
 dnl  dnl
 if test x"$enable_sdlmixer" = "xyes"; then  AC_MSG_CHECKING([whether to enable debugging])
         AM_PATH_SDL(1.2.0)  if test x"$enable_debug" = "xyes"; then
         if test x"$no_sdl" != "xyes"; then    CFLAGS="$CFLAGS -DDEBUG -g -O0"
                 AC_DEFINE(USE_SDLAUDIO,,[Define if you have the SDL library.])    CFLAGS="$CFLAGS -Wstack-protector -fstack-protector --param ssp-buffer-size=1"
         fi    enable_warning=yes
   else
     CFLAGS="$CFLAGS -DNDEBUG"
 fi  fi
   AC_MSG_RESULT($enable_debug)
   
 dnl  dnl
 dnl Checks for SDL_mixer  dnl Checks for warning
 dnl  dnl
 if test x"$enable_sdlmixer" = "xyes"; then  AC_MSG_CHECKING([whether to enable warning])
         if test x"$no_sdl" != "xyes"; then  if test x"$enable_warning" = "xyes"; then
                 AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,    CFLAGS="$CFLAGS -Wall -Wcast-align"
                         AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])    CFLAGS="$CFLAGS -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
                         SDL_LIBS="$SDL_LIBS -lSDL_mixer",    CFLAGS="$CFLAGS -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
                         $SDL_CFLAGS, $SDL_LIBS)  fi
         fi  AC_MSG_RESULT($enable_warning)
   
   dnl
   dnl Checks for Xnp2 version
   dnl
   NP2VER_X11=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="-"} NF==2 {print $2}'`
   if test x"$NP2VER_X11" != "x"; then
     NP2VER_X11="\"-$NP2VER_X11\""
     AC_DEFINE_UNQUOTED(NP2VER_X11,$NP2VER_X11,[Define if Xnp2 version is available])
 fi  fi
   
 dnl  dnl
 dnl Output Makefiles  dnl Output Makefiles
 dnl  dnl
 AC_CONFIG_FILES([  AC_CONFIG_FILES([Makefile])
         Makefile  
         xnp2.1  
         xnp2.1j  
 ])  
 AC_OUTPUT  AC_OUTPUT
Removed from v.1.1  
changed lines
  Added in v.1.15

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