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

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

version 1.9, 2011/12/24 02:15:40 version 1.11, 2011/12/24 03:49:04
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-20111223, 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 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
   
Line 40  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 52  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 69  AC_CHECK_FUNCS(sqrt,,AC_CHECK_LIB(m,sqrt Line 70  AC_CHECK_FUNCS(sqrt,,AC_CHECK_LIB(m,sqrt
 dnl  dnl
 dnl Checks for X  dnl Checks for X
 dnl  dnl
   AC_PATH_X
 AC_PATH_XTRA  AC_PATH_XTRA
   AC_SUBST(XLIB,"")
 if test x"$no_x" != x"yes"; then  if test x"$no_x" != x"yes"; then
         X_LIBS="$X_LIBS -lX11"          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  fi
   
 dnl  dnl
Line 97  dnl Line 102  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,,
     AC_MSG_ERROR(Test for GTK failed. See the file 'x11/INSTALL.ja' for help))          AC_MSG_ERROR(Test for GTK failed. See the file 'x11/INSTALL.ja' for help))
 AC_SUBST(GTK_CFLAGS)  AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)  AC_SUBST(GTK_LIBS)
 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.])
         AC_DEFINE(USE_GTK2,1,[Define to 1 if you have the GTK+-2.6 (or later) library.])  
 fi  
   
 dnl  dnl
 dnl Checks for SDL  dnl Checks for SDL
Line 121  if test x"$enable_sdlmixer" = "xyes"; th Line 124  if test x"$enable_sdlmixer" = "xyes"; th
         if test x"$no_sdl" != "xyes"; then          if test x"$no_sdl" != "xyes"; then
                 AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,                  AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,
                         AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])                          AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])
                         SDL_LIBS="$SDL_LIBS -lSDL_mixer",                          SDL_LIBS="$SDL_LIBS -lSDL_mixer",,$SDL_LIBS)
                         $SDL_CFLAGS, $SDL_LIBS)  
         fi          fi
 fi  fi
   
Line 130  dnl Line 132  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])
           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)],
                 ,                  ,
                 $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS)                  [#include <X11/Xlib.h>])
           CFLAGS=$ac_cv_save_cflags
 fi  fi
   
 dnl  dnl
 dnl Checks for IA-32 CPU emulation  dnl Checks for IA-32 CPU emulation
 dnl  dnl
 AM_CONDITIONAL(CPUCORE_IA32, test x"$enable_ia32" = "xyes")  AC_MSG_CHECKING([whether to enable IA-32 emulation])
   AM_CONDITIONAL(CPUCORE_IA32,test x"$enable_ia32" = "xyes")
   if test x"$enable_ia32" = "xyes"; then
           AC_DEFINE(CPUCORE_IA32,,[Define if use IA-32 emulation])
   fi
   AC_MSG_RESULT($enable_ia32)
   
 dnl  dnl
 dnl Checks for debug mode  dnl Checks for debug mode
Removed from v.1.9  
changed lines
  Added in v.1.11

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