"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
libcaca-0.99.beta19.tar.gz and libcaca-0.99.beta20.tar.bz2

About: libcaca is a graphics library that outputs text instead of pixels, so that it can work on older video cards or text terminals (something like an advanced AAlib library).

configure.ac  (libcaca-0.99.beta19):configure.ac  (libcaca-0.99.beta20.tar.bz2)
AC_INIT(libcaca, 0.99.beta19) AC_INIT([libcaca],[0.99.beta20])
AC_PREREQ(2.50) AC_PREREQ([2.71])
AC_CONFIG_AUX_DIR(.auto) AC_CONFIG_AUX_DIR(.auto)
AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
dnl We cannot use subdir-objects because of a bug that will eg. remove AM_INIT_AUTOMAKE([foreign no-define tar-ustar silent-rules subdir-objects])
dnl ../src/.deps upon distclean when a file from ../src/ is used.
AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules subdir-objects])
dnl AM_MAINTAINER_MODE dnl AM_MAINTAINER_MODE
AM_DEFAULT_VERBOSITY=0 AM_DEFAULT_VERBOSITY=0
AM_CONFIG_HEADER(config.h) AC_CONFIG_HEADERS([config.h])
LT_MAJOR="0" LT_MAJOR="0"
LT_MINOR="99" LT_MINOR="99"
LT_MICRO="19" LT_MICRO="20"
AC_SUBST(LT_MAJOR) AC_SUBST(LT_MAJOR)
AC_SUBST(LT_MINOR) AC_SUBST(LT_MINOR)
AC_SUBST(LT_MICRO) AC_SUBST(LT_MICRO)
LT_VERSION="$LT_MAJOR:$LT_MINOR:$LT_MICRO" LT_VERSION="$LT_MAJOR:$LT_MINOR:$LT_MICRO"
AC_SUBST(LT_VERSION) AC_SUBST(LT_VERSION)
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CPP AC_PROG_CPP
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CXXCPP AC_PROG_CXXCPP
_AM_DEPENDENCIES([OBJC]) _AM_DEPENDENCIES([OBJC])
OBJC="${CC}" OBJC="${CC}"
AC_SUBST(OBJC) AC_SUBST(OBJC)
AC_SUBST(OBJCFLAGS) AC_SUBST(OBJCFLAGS)
AM_PROG_AS AM_PROG_AS
AC_LIBTOOL_WIN32_DLL LT_INIT([win32-dll])
AM_PROG_LIBTOOL LT_LANG([C++])
AC_LIBTOOL_CXX
AC_C_CONST AC_C_CONST
AC_C_INLINE AC_C_INLINE
AC_TYPE_SIGNAL
dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
dnl now otherwise it might be set in an obscure if statement. Same thing for dnl now otherwise it might be set in an obscure if statement. Same thing for
dnl PKG_PROG_PKG_CONFIG which needs to be called first. dnl PKG_PROG_PKG_CONFIG which needs to be called first.
AC_EGREP_CPP(yes, foo) AC_EGREP_CPP(yes, foo)
PKG_PROG_PKG_CONFIG() PKG_PROG_PKG_CONFIG()
m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
if test "${build}" != "${host}" -a "${PKG_CONFIG_LIBDIR}" = ""; then if test "${build}" != "${host}" -a "${PKG_CONFIG_LIBDIR}" = ""; then
export PKG_CONFIG_LIBDIR=/dev/null export PKG_CONFIG_LIBDIR=/dev/null
fi fi
skipping to change at line 129 skipping to change at line 125
CFLAGS="${CFLAGS} -fno-builtin -O0 -I. -I.. -I../caca/ -Wall -D__KERNEL__ -fno -stack-protector -m32" CFLAGS="${CFLAGS} -fno-builtin -O0 -I. -I.. -I../caca/ -Wall -D__KERNEL__ -fno -stack-protector -m32"
LDFLAGS="${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -fno-stack-protecto r" LDFLAGS="${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -fno-stack-protecto r"
AC_DEFINE(USE_KERNEL, 1, Define to 1 to activate kernel mode) AC_DEFINE(USE_KERNEL, 1, Define to 1 to activate kernel mode)
fi fi
AM_CONDITIONAL(USE_KERNEL, test "${ac_cv_my_have_kernel}" = "yes") AM_CONDITIONAL(USE_KERNEL, test "${ac_cv_my_have_kernel}" = "yes")
AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h endian.h unist d.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h termio s.h) AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h endian.h unist d.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h termio s.h)
AC_CHECK_FUNCS(signal ioctl snprintf sprintf_s vsnprintf vsnprintf_s getenv pute nv strcasecmp htons) AC_CHECK_FUNCS(signal ioctl snprintf sprintf_s vsnprintf vsnprintf_s getenv pute nv strcasecmp htons)
AC_CHECK_FUNCS(usleep gettimeofday atexit) AC_CHECK_FUNCS(usleep gettimeofday atexit)
AC_CHECK_HEADERS(_mingw.h,
[CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0"])
ac_cv_have_getopt_long="no" ac_cv_have_getopt_long="no"
AC_CHECK_FUNCS(getopt_long, AC_CHECK_FUNCS(getopt_long,
[ac_cv_have_getopt_long="yes"], [ac_cv_have_getopt_long="yes"],
[AC_CHECK_LIB(gnugetopt, getopt_long, [AC_CHECK_LIB(gnugetopt, getopt_long,
[ac_cv_have_getopt_long="yes" [ac_cv_have_getopt_long="yes"
GETOPT_LIBS="${GETOPT_LIBS} -lgnugetopt"])]) GETOPT_LIBS="${GETOPT_LIBS} -lgnugetopt"])])
if test "$ac_cv_have_getopt_long" != "no"; then if test "$ac_cv_have_getopt_long" != "no"; then
AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the ‘getopt_long’ funct ion.) AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the ‘getopt_long’ funct ion.)
fi fi
AC_SUBST(GETOPT_LIBS) AC_SUBST(GETOPT_LIBS)
AC_MSG_CHECKING(for Sleep) AC_MSG_CHECKING(for Sleep)
AC_TRY_COMPILE([#include <windows.h>],[Sleep(42);], AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <windows.h>]],
[[Sleep(42);]])],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_SLEEP, 1, [Define to 1 if you have the ‘Sleep’ function.])], AC_DEFINE(HAVE_SLEEP, 1, [Define to 1 if you have the ‘Sleep’ function.])],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for fsin/fcos) AC_MSG_CHECKING(for fsin/fcos)
AC_TRY_COMPILE([],[double x; asm volatile("fsin; fcos":"=t"(x):);], AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[]],
[[double x; asm volatile("fsin; fcos":"=t"(x):);]])],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FSIN_FCOS, 1, [Define to 1 if you have the ‘fsin’ and ‘fcos’ in structions.])], AC_DEFINE(HAVE_FSIN_FCOS, 1, [Define to 1 if you have the ‘fsin’ and ‘fcos’ in structions.])],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for fldln2/fxch/fyl2x) AC_MSG_CHECKING(for fldln2/fxch/fyl2x)
AC_TRY_COMPILE([],[double x; asm volatile("fldln2; fldln2; fxch; fyl2x":"=t"(x): AC_COMPILE_IFELSE(
);], [AC_LANG_PROGRAM(
[[]],
[[double x; asm volatile("fldln2; fldln2; fxch; fyl2x":"=t"(x):);]])],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FLDLN2, 1, [Define to 1 if you have the ‘fldln2’ and other floa ting point instructions.])], AC_DEFINE(HAVE_FLDLN2, 1, [Define to 1 if you have the ‘fldln2’ and other floa ting point instructions.])],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
AC_CHECK_HEADERS(zlib.h) AC_CHECK_HEADERS(zlib.h)
AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="${ZLIB_LIBS} -lz"]) AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="${ZLIB_LIBS} -lz"])
AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm") AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
CACA_DRIVERS="" CACA_DRIVERS=""
skipping to change at line 258 skipping to change at line 266
CACA_DRIVERS="${CACA_DRIVERS} gl" CACA_DRIVERS="${CACA_DRIVERS} gl"
elif test "${enable_gl}" = "yes"; then elif test "${enable_gl}" = "yes"; then
AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files]) AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files])
fi fi
PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"]) PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"])
fi fi
AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes") AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes")
if test "${enable_cocoa}" != "no"; then if test "${enable_cocoa}" != "no"; then
ac_cv_my_have_cocoa="no" ac_cv_my_have_cocoa="no"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -ObjC++"
AC_CHECK_HEADERS(Cocoa/Cocoa.h, AC_CHECK_HEADERS(Cocoa/Cocoa.h,
[ac_cv_my_have_cocoa="yes"]) [ac_cv_my_have_cocoa="yes"])
CFLAGS="$save_CFLAGS"
if test "${ac_cv_my_have_cocoa}" = "yes"; then if test "${ac_cv_my_have_cocoa}" = "yes"; then
[[[ "$target_os" =~ [0-9]+ ]]] && darwin_ver="${BASH_REMATCH[[0]]}"
case x${target} in case x${target} in
xpowerpc*darwin*) xpowerpc*darwin*)
# 10.3 needed to link with X11 # 10.3 needed to link with X11
MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}" MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}"
GCC_VERSION="${GCC_VERSION:-3.3}" GCC_VERSION="${GCC_VERSION:-3.3}"
ARCH="${ARCH:--arch ppc}" ARCH="${ARCH:--arch ppc}"
MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/u sr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}" MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/u sr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}"
MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:--nostdinc++ -I${MACOSX_SDK}/us r/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/$ {GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSIO N}/c++/backward}" MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:--nostdinc++ -I${MACOSX_SDK}/us r/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/$ {GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSIO N}/c++/backward}"
MACOSX_SDK_LDFLAGS="${MACOSX_SDK_LDFLAGS:--L${MACOSX_SDK}/usr/lib/gcc/darw in -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib}" MACOSX_SDK_LDFLAGS="${MACOSX_SDK_LDFLAGS:--L${MACOSX_SDK}/usr/lib/gcc/darw in -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib}"
;; ;;
skipping to change at line 288 skipping to change at line 300
x*86*darwin*) x*86*darwin*)
MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}" MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}"
GCC_VERSION="${GCC_VERSION:-4.0}" GCC_VERSION="${GCC_VERSION:-4.0}"
ARCH="${ARCH:--arch x86_64}" ARCH="${ARCH:--arch x86_64}"
MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}" MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}" MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
;; ;;
esac esac
CC="${CC:-gcc-${GCC_VERSION}}" CC="${CC:-gcc-${GCC_VERSION}}"
CXX="${CXX:-g++-${GCC_VERSION}}" CXX="${CXX:-g++-${GCC_VERSION}}"
MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Libra if [[ "$darwin_ver" -lt "13" ]]; then
ry/Frameworks}" MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Lib
CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}" rary/Frameworks}"
CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS} -mmacosx-version-min=10.5" CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
CXXFLAGS="${CXXFLAGS} ${MACOSX_SDK_CXXFLAGS} -mmacosx-version-min=10.5" CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS} -mmacosx-version-min=10.5"
OBJCFLAGS="${OBJCFLAGS} ${MACOSX_SDK_CFLAGS} -mmacosx-version-min=10.5" CXXFLAGS="${CXXFLAGS} ${MACOSX_SDK_CXXFLAGS} -mmacosx-version-min=10.5"
LDFLAGS="${ARCH} ${MACOSX_SDK_LDFLAGS} ${LDFLAGS}" OBJCFLAGS="${OBJCFLAGS} ${MACOSX_SDK_CFLAGS} -mmacosx-version-min=10.5"
AC_DEFINE(USE_COCOA, 1, Define to 1 to activate the Cocoa backend driver) LDFLAGS="${ARCH} ${MACOSX_SDK_LDFLAGS} ${LDFLAGS}"
CACA_LIBS="${CACA_LIBS} -Wl,-syslibroot,${MACOSX_SDK},-framework,Cocoa" CACA_LIBS="${CACA_LIBS} -Wl,-syslibroot,${MACOSX_SDK},-framework,Cocoa"
else
CACA_LIBS="${CACA_LIBS} -Wl,-framework,Cocoa"
fi
CACA_DRIVERS="${CACA_DRIVERS} cocoa" CACA_DRIVERS="${CACA_DRIVERS} cocoa"
AC_DEFINE(USE_COCOA, 1, Define to 1 to activate the Cocoa backend driver)
elif test "${enable_cocoa}" = "yes"; then elif test "${enable_cocoa}" = "yes"; then
AC_MSG_ERROR([cannot find Cocoa development files]) AC_MSG_ERROR([cannot find Cocoa development files])
fi fi
fi fi
AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" = "yes") AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" = "yes")
if test "${enable_ncurses}" != "no"; then if test "${enable_ncurses}" != "no"; then
ac_cv_my_have_ncurses="no" ac_cv_my_have_ncurses="no"
AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h, AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h,
[ncurses="no" [ncurses="no"
skipping to change at line 381 skipping to change at line 397
AC_SUBST(X11_LIBS) AC_SUBST(X11_LIBS)
AC_SUBST(GL_CFLAGS) AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS) AC_SUBST(GL_LIBS)
# Optimizations # Optimizations
CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer" CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
# Code qui fait des warnings == code de porc == deux baffes dans ta gueule # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-protot ypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-co mpare" CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-protot ypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-co mpare"
CXXFLAGS="${CXXFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -W sign-compare" CXXFLAGS="${CXXFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -W sign-compare"
dnl Visibility annotations...
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fvisibility=hidden -Wall -Werror"
AC_MSG_CHECKING(whether compiler supports visibility annotations)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void __attribute__((visibility("default")))
foo(void); void foo(void) {}]])],
[CFLAGS="$saved_CFLAGS -fvisibility=hidden -DCACA_ENABLE_VISIB
ILITY";
AC_MSG_RESULT(yes)],
[CFLAGS="$saved_CFLAGS"
AC_MSG_RESULT(no)])
CACA_BINDINGS="" CACA_BINDINGS=""
# Build the C++ bindings? # Build the C++ bindings?
ac_cv_my_have_cxx="no" ac_cv_my_have_cxx="no"
if test "${enable_cxx}" != "no"; then if test "${enable_cxx}" != "no"; then
AC_MSG_CHECKING([working <iostream>]) AC_MSG_CHECKING([working <iostream>])
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iostream>]], [[]])],[ac_cv_my_h
[#include <iostream>], ave_cxx="yes"
[], CACA_BINDINGS="${CACA_BINDINGS} C++"],[])
[ac_cv_my_have_cxx="yes"
CACA_BINDINGS="${CACA_BINDINGS} C++"])
AC_LANG_POP(C++) AC_LANG_POP(C++)
AC_MSG_RESULT([$ac_cv_my_have_cxx]) AC_MSG_RESULT([$ac_cv_my_have_cxx])
fi fi
AM_CONDITIONAL(USE_CXX, test "${ac_cv_my_have_cxx}" = "yes") AM_CONDITIONAL(USE_CXX, test "${ac_cv_my_have_cxx}" = "yes")
# Build the .NET bindings? # Build the .NET bindings?
ac_cv_my_have_csharp="no" ac_cv_my_have_csharp="no"
if test "${enable_csharp}" != "no"; then if test "${enable_csharp}" != "no"; then
AC_PATH_PROG(CSC, csc, no) AC_PATH_PROG(CSC, csc, no)
if test "$CSC" = "no"; then if test "$CSC" = "no"; then
skipping to change at line 465 skipping to change at line 488
# Build the Python bindings? # Build the Python bindings?
ac_cv_my_have_python="no" ac_cv_my_have_python="no"
if test "${enable_python}" != "no"; then if test "${enable_python}" != "no"; then
AM_PATH_PYTHON(2.2, ac_cv_my_have_python="yes", :) AM_PATH_PYTHON(2.2, ac_cv_my_have_python="yes", :)
fi fi
AM_CONDITIONAL(USE_PYTHON, test "${ac_cv_my_have_python}" = "yes") AM_CONDITIONAL(USE_PYTHON, test "${ac_cv_my_have_python}" = "yes")
# Build the Ruby bindings? # Build the Ruby bindings?
ac_cv_my_have_ruby="no" ac_cv_my_have_ruby="no"
ac_cv_my_have_ruby_minitest="no"
if test "${enable_ruby}" != "no"; then if test "${enable_ruby}" != "no"; then
AC_PATH_PROG(RUBY, ruby, no) AC_PATH_PROG(RUBY, ruby, no)
if test "${RUBY}" != "no"; then if test "${RUBY}" != "no"; then
RUBY_CFLAGS="$(ruby -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $h RUBY_CFLAGS="$("${RUBY}" -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir"
drdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS",
)')" conf)')"
RUBY_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') RUBY_LIBS="-L$("${RUBY}" -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@
-l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')" :>@') -l$("${RUBY}" -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@
RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdi ')"
r"@:>@'` RUBY_SITEARCHDIR=`"${RUBY}" -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitea
RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir" rchdir"@:>@'`
@:>@'` RUBY_SITELIBDIR=`"${RUBY}" -r rbconfig -e 'print RbConfig::CONFIG@<:@"siteli
bdir"@:>@'`
AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_CFLAGS)
AC_SUBST(RUBY_LIBS) AC_SUBST(RUBY_LIBS)
AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_SITELIBDIR) AC_SUBST(RUBY_SITELIBDIR)
CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}"
AC_CHECK_HEADERS([ruby.h], AC_CHECK_HEADERS([ruby.h],
[ac_cv_my_have_ruby="yes" [ac_cv_my_have_ruby="yes"
CACA_BINDINGS="${CACA_BINDINGS} Ruby"]) CACA_BINDINGS="${CACA_BINDINGS} Ruby"])
# For unit tests
AC_MSG_CHECKING(for ruby-minitest)
if "${RUBY}" -e "require 'minitest'" 2>/dev/null; then
ac_cv_my_have_ruby_minitest="yes"
fi
AC_MSG_RESULT(${ac_cv_my_have_ruby_minitest})
fi fi
fi fi
AM_CONDITIONAL(USE_RUBY, test "${ac_cv_my_have_ruby}" = "yes") AM_CONDITIONAL(USE_RUBY, test "${ac_cv_my_have_ruby}" = "yes")
AM_CONDITIONAL(USE_RUBY_MINITEST, test "${ac_cv_my_have_ruby_minitest}" = "yes")
AC_MSG_CHECKING(available language bindings) AC_MSG_CHECKING(available language bindings)
if test -z "${CACA_BINDINGS}"; then if test -z "${CACA_BINDINGS}"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
CACA_BINDINGS="${CACA_BINDINGS# *}" CACA_BINDINGS="${CACA_BINDINGS# *}"
AC_MSG_RESULT([${CACA_BINDINGS}]) AC_MSG_RESULT([${CACA_BINDINGS}])
fi fi
# Build cacaserver? # Build cacaserver?
skipping to change at line 543 skipping to change at line 574
LATEX="no" LATEX="no"
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
fi fi
fi fi
fi fi
AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no") AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no")
AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no") AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
# Use cppunit for unit tests? # Use cppunit for unit tests?
PKG_CHECK_MODULES(CPPUNIT, cppunit, [CPPUNIT="yes"], [CPPUNIT="no"]) AS_IF([test "x$enable_cppunit" = "xyes"], [
AM_CONDITIONAL(USE_CPPUNIT, test "$CPPUNIT" = "yes") PKG_CHECK_MODULES([CPPUNIT], [cppunit])
])
AM_CONDITIONAL([USE_CPPUNIT], [test "x$enable_cppunit" = "xyes"])
# Use zzuf for fuzzing tests? # Use zzuf for fuzzing tests?
ZZUF="no" ZZUF="no"
if test "${enable_zzuf}" != "no"; then if test "${enable_zzuf}" != "no"; then
AC_PATH_PROG(ZZUF, zzuf, no) AC_PATH_PROG(ZZUF, zzuf, no)
fi fi
AM_CONDITIONAL(USE_ZZUF, test "${ZZUF}" != "no") AM_CONDITIONAL(USE_ZZUF, test "${ZZUF}" != "no")
AC_CONFIG_FILES( AC_CONFIG_FILES(
[Makefile [Makefile
kernel/Makefile kernel/Makefile
caca/Makefile caca/Makefile
caca/t/Makefile
src/Makefile src/Makefile
examples/Makefile examples/Makefile
test/Makefile
tools/Makefile tools/Makefile
java/Makefile java/Makefile
caca-sharp/Makefile caca-sharp/Makefile
cxx/Makefile cxx/Makefile
python/Makefile python/Makefile
ruby/Makefile ruby/Makefile
doc/Makefile doc/Makefile
win32/Makefile build/Makefile
]) ])
AC_CONFIG_FILES( AC_CONFIG_FILES(
[caca/caca.pc [caca/caca.pc
caca-sharp/caca-sharp.dll.config caca-sharp/caca-sharp.dll.config
cxx/caca++.pc cxx/caca++.pc
doc/doxygen.cfg doc/doxygen.cfg
]) ])
AC_CONFIG_FILES([caca-config], [chmod 0755 caca-config]) AC_CONFIG_FILES([caca-config], [chmod 0755 caca-config])
AC_OUTPUT AC_OUTPUT
 End of changes. 25 change blocks. 
43 lines changed or deleted 79 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)