"Fossies" - the Fresh Open Source Software Archive  

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

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

configure.ac  (xfe-1.41):configure.ac  (xfe-1.42)
# #
# 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.41]) AC_INIT([xfe], [1.42])
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 139 skipping to change at line 139
xft_libs=`$pkg_config --libs xft` xft_libs=`$pkg_config --libs xft`
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"
fi 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 "===================================== Error! ======================
=========================="
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 "To enable Xft support in FOX, rebuild the FOX library using the fol
lowing commands:"
echo " ./configure --with-xft"
echo " make"
echo " sudo make install"
echo "===================================================================
=========================="
echo ""
AC_MSG_ERROR("missing Xft support in FOX")
fi fi
# Check for Xlib headers # Check for Xlib headers
AC_CHECK_HEADER(X11/Xlib.h,,AC_MSG_ERROR("Xlib.h not found")) AC_CHECK_HEADER(X11/Xlib.h,,AC_MSG_ERROR("Xlib.h not found"))
# Check for XRandR support # Check for XRandR support
AC_MSG_CHECKING(for xrandr extension) AC_MSG_CHECKING(for xrandr extension)
AC_ARG_WITH(xrandr,[ --with-xrandr compile with XRandR support]) AC_ARG_WITH(xrandr,[ --with-xrandr compile with XRandR support])
AC_MSG_RESULT([$with_xrandr]) AC_MSG_RESULT([$with_xrandr])
if test "x$with_xrandr" != "xno"; then if test "x$with_xrandr" != "xno"; then
AC_CHECK_HEADERS(X11/extensions/Xrandr.h,CXXFLAGS="${CXXFLAGS} -DHAVE_XRANDR_H=1 "; LIBS="${LIBS} -lXrandr") AC_CHECK_HEADERS(X11/extensions/Xrandr.h,CXXFLAGS="${CXXFLAGS} -DHAVE_XRANDR_H=1 "; LIBS="${LIBS} -lXrandr")
fi fi
# Check for libPNG # Check for libPNG
AC_CHECK_LIB(png, png_read_info,,AC_MSG_ERROR("libPNG not found")) AC_CHECK_LIB(png, png_read_info,,AC_MSG_ERROR("libPNG not found"))
AC_CHECK_HEADER(png.h,,AC_MSG_ERROR("png.h not found")) AC_CHECK_HEADER(png.h,,AC_MSG_ERROR("png.h not found"))
# Check for fontconfig
AC_CHECK_LIB(fontconfig, FcInit,, AC_MSG_ERROR("fontconfig not found"))
AC_CHECK_HEADER(fontconfig/fontconfig.h,,AC_MSG_ERROR("fontconfig.h not found"))
# 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
fi fi
skipping to change at line 230 skipping to change at line 245
icons/tango-theme/Makefile icons/kde-theme/Makefile) icons/tango-theme/Makefile icons/kde-theme/Makefile)
# Display CXXFLAGS, CFLAGS and LIBS # Display CXXFLAGS, CFLAGS and LIBS
echo "" echo ""
echo "======================== Compiler and linker flags ======================= =" echo "======================== Compiler and linker flags ======================= ="
echo "CXXFLAGS=$CXXFLAGS" echo "CXXFLAGS=$CXXFLAGS"
echo "CFLAGS=$CFLAGS" echo "CFLAGS=$CFLAGS"
echo "LIBS=$LIBS" echo "LIBS=$LIBS"
echo "========================================================================== =" echo "========================================================================== ="
# Warning message about Xft support
if test "x$TEST_XFT" = "x" ; then
echo ""
echo "==================================== Warning ======================
=========================="
echo "Configure has detected that your FOX library was compiled without X
ft support."
echo "You will not have antialiased fonts in Xfe, and non UTF-8 strings c
ould be wrongly displayed."
echo "If this is what you want, you can safely ignore what follows."
echo "If not, you have to enable Xft support in FOX and recompile it."
echo " Do: './configure --with-xft' to enable Xft support in FOX
."
echo " Then : 'make' to compile the FOX library."
echo " And: 'make install' (as root) to install it."
echo "===================================================================
=========================="
fi
echo "" echo ""
echo "Configure finished!" echo "Configure finished!"
echo " Do: 'make' to compile Xfe." echo " Do: 'make' to compile Xfe."
echo " Then: 'make install' (as root) to install Xfe." echo " Then: 'make install' (as root) to install Xfe."
echo "" echo ""
 End of changes. 4 change blocks. 
20 lines changed or deleted 21 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS