"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
xfe-1.42.tar.gz and xfe-1.43.tar.gz

About: Xfe (X File Explorer) is a file manager and browser (using the FOX toolkit).

configure.ac  (xfe-1.42):configure.ac  (xfe-1.43)
# #
# Script for autoconf 2.69 or later and automake 1.14 or later # Script for autoconf 2.69 or later and automake 1.14 or later
# #
# Initialize # Initialize
AC_INIT([xfe], [1.42]) AC_INIT([xfe], [1.43])
AC_CONFIG_SRCDIR([src/XFileExplorer.cpp]) AC_CONFIG_SRCDIR([src/XFileExplorer.cpp])
AM_INIT_AUTOMAKE([subdir-objects -Wall]) AM_INIT_AUTOMAKE([subdir-objects -Wall])
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
# Test if compilation variables are already set and if not, reset them # Test if compilation variables are already set and if not, reset them
# This mechanism prevents these variables to be changed by the following AC macr os # This mechanism prevents these variables to be changed by the following AC macr os
# while still allowing to use user's variables if they are defined # while still allowing to use user's variables if they are defined
if test "$CXXFLAGS" = ""; then if test "$CXXFLAGS" = ""; then
CXXFLAGS="" CXXFLAGS=""
fi fi
skipping to change at line 32 skipping to change at line 32
LIBS="$LIBS -lX11" LIBS="$LIBS -lX11"
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
# Checks for programs # Checks for programs
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG
# Internationalization # Internationalization
IT_PROG_INTLTOOL IT_PROG_INTLTOOL
GETTEXT_PACKAGE=xfe GETTEXT_PACKAGE=xfe
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name, for get text]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name, for get text])
AM_GNU_GETTEXT AM_GNU_GETTEXT
# Checks for header files. # Checks for header files.
AC_PATH_X AC_PATH_X
skipping to change at line 103 skipping to change at line 104
# Include flags for the FOX library # Include flags for the FOX library
FOXCFLAGS=`$FOX_CONFIG --cflags` FOXCFLAGS=`$FOX_CONFIG --cflags`
CXXFLAGS="${CXXFLAGS} $FOXCFLAGS" CXXFLAGS="${CXXFLAGS} $FOXCFLAGS"
# Check if FOX was compiled with xft support # Check if FOX was compiled with xft support
TEST_XFT=`$FOX_CONFIG --libs | grep Xft` TEST_XFT=`$FOX_CONFIG --libs | grep Xft`
if test "x$TEST_XFT" != "x" ; then if test "x$TEST_XFT" != "x" ; then
echo "checking whether FOX was compiled with Xft support... yes" echo "checking whether FOX was compiled with Xft support... yes"
# Check for FreeType2 headers # Check for FreeType2
freetype_config='' PKG_CHECK_MODULES(FREETYPE, freetype2, [
AC_CHECK_PROGS(freetype_config,freetype-config,) freetype_cflags="$FREETYPE_CFLAGS"
if test -n "$freetype_config"; then freetype_libs="$FREETYPE_LIBS"
freetype_cflags=`$freetype_config --cflags` LIBS="$LIBS $freetype_libs"
freetype_libs=`$freetype_config --libs` CPPFLAGS="$freetype_cflags $CPPFLAGS"
LIBS="$LIBS $freetype_libs" ], AC_MSG_ERROR("freetype not found"))
CPPFLAGS="$freetype_cflags $CPPFLAGS"
fi
AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/fthea
der.h,,AC_MSG_ERROR("ftheader.h not found"))])
# Check for Xft headers # Check for Xft headers
xft_config='' xft_config=''
AC_CHECK_PROGS(xft_config,xft-config,) AC_CHECK_PROGS(xft_config,xft-config,)
if test -n "$xft_config"; then if test -n "$xft_config"; then
xft_cflags=`$xft_config --cflags` xft_cflags=`$xft_config --cflags`
xft_libs=`$xft_config --libs` xft_libs=`$xft_config --libs`
LIBS="$LIBS $xft_libs" LIBS="$LIBS $xft_libs"
CPPFLAGS="$xft_cflags $CPPFLAGS" CPPFLAGS="$xft_cflags $CPPFLAGS"
CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H" CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
else else
# On some systems (e.g. Fedora) xft-config is deprecated and pkg- # On some systems xft-config is deprecated and pkg-config should
config should be used instead be used instead
pkg_config='' PKG_CHECK_MODULES(XFT, xft, [
AC_CHECK_PROGS(pkg_config,pkg-config,) xft_cflags="$XFT_CFLAGS"
if test -n "$pkg_config"; then xft_libs="$XFT_LIBS"
xft_cflags=`$pkg_config --cflags xft` LIBS="$LIBS $xft_libs"
xft_libs=`$pkg_config --libs xft` CPPFLAGS="$xft_cflags $CPPFLAGS"
LIBS="$LIBS $xft_libs" CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H"
CPPFLAGS="$xft_cflags $CPPFLAGS" ], AC_MSG_ERROR("Xft not found"))
CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
fi
fi fi
AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found")) AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found"))
else else
echo "checking whether FOX was compiled with Xft support... no" echo "checking whether FOX was compiled with Xft support... no"
echo "" echo ""
echo "===================================== Error! ====================== ==========================" echo "===================================== Error! ====================== =========================="
echo "Configure has detected that your FOX library was compiled without X ft support." echo "Configure has detected that your FOX library was compiled without X ft support."
echo "Since Xfe version 1.42, Xft is mandatory and FOX *must* have been c ompiled with Xft support." echo "Since Xfe version 1.42, Xft is mandatory and FOX *must* have been c ompiled with Xft support."
echo "To enable Xft support in FOX, rebuild the FOX library using the fol lowing commands:" echo "To enable Xft support in FOX, rebuild the FOX library using the fol lowing commands:"
skipping to change at line 180 skipping to change at line 176
# Check for startup notification support # Check for startup notification support
AC_MSG_CHECKING(for startup notification) AC_MSG_CHECKING(for startup notification)
AC_ARG_ENABLE(sn,[ --disable-sn compile without startup notification support]) AC_ARG_ENABLE(sn,[ --disable-sn compile without startup notification support])
AC_MSG_RESULT([$enable_sn]) AC_MSG_RESULT([$enable_sn])
AC_SUBST(STARTUPNOTIFY,false) AC_SUBST(STARTUPNOTIFY,false)
if test "x$enable_sn" != "xno"; then if test "x$enable_sn" != "xno"; then
CXXFLAGS="${CXXFLAGS} -DSTARTUP_NOTIFICATION" CXXFLAGS="${CXXFLAGS} -DSTARTUP_NOTIFICATION"
AC_SUBST(STARTUPNOTIFY,true) AC_SUBST(STARTUPNOTIFY,true)
enable_sn=yes enable_sn=yes
# Check for xcb libs
PKG_CHECK_MODULES([xcb], [xcb >= 1.6],,
[AC_MSG_ERROR([Cannot find xcb])])
PKG_CHECK_MODULES([xcb_aux], [xcb-aux],,
[AC_MSG_ERROR([Cannot find xcb-aux])])
PKG_CHECK_MODULES([xcb_event], [xcb-event],,
[AC_MSG_ERROR([Cannot find xcb-event])])
PKG_CHECK_MODULES([x11_xcb], [x11-xcb],,
[AC_MSG_ERROR([Cannot find x11-xcb])])
LIBS="$LIBS $xcb_LIBS $xcb_aux_LIBS $x11_xcb_LIBS"
fi fi
AM_CONDITIONAL(STARTUPNOTIFY, [test x$enable_sn = xyes]) AM_CONDITIONAL(STARTUPNOTIFY, [test x$enable_sn = xyes])
# Building for debugging # Building for debugging
AC_MSG_CHECKING(for debugging) AC_MSG_CHECKING(for debugging)
AC_ARG_ENABLE(debug,[ --enable-debug compile for debugging]) AC_ARG_ENABLE(debug,[ --enable-debug compile for debugging])
AC_MSG_RESULT([$enable_debug]) AC_MSG_RESULT([$enable_debug])
# Add debug symbols # Add debug symbols
AC_MSG_CHECKING(minimalflags) AC_MSG_CHECKING(minimalflags)
 End of changes. 5 change blocks. 
23 lines changed or deleted 29 lines changed or added

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