|
| 1 | +diff --git xfe-clean/configure.ac xfe-workdir/configure.ac |
| 2 | +index 0fa6dc9..ecaa037 100644 |
| 3 | +--- xfe-clean/configure.ac |
| 4 | ++++ xfe-workdir/configure.ac |
| 5 | +@@ -69,9 +69,9 @@ AC_FUNC_GETGROUPS |
| 6 | + AC_FUNC_GETMNTENT |
| 7 | + AC_FUNC_LSTAT |
| 8 | + AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK |
| 9 | +-AC_FUNC_MALLOC |
| 10 | ++#AC_FUNC_MALLOC |
| 11 | + AC_FUNC_MKTIME |
| 12 | +-AC_FUNC_REALLOC |
| 13 | ++#AC_FUNC_REALLOC |
| 14 | + AC_FUNC_STAT |
| 15 | + AC_FUNC_UTIME_NULL |
| 16 | + AC_CHECK_FUNCS([endgrent endpwent gethostname getmntent gettimeofday lchown memset mkdir mkfifo putenv rmdir setlocale sqrt strchr strdup strerror strstr strtol strtoul strtoull utime]) |
| 17 | +@@ -87,25 +87,19 @@ AC_CHECK_LIB(FOX-1.6,fxfindfox,,AC_MSG_ERROR("libFOX-1.6 not found")) |
| 18 | + |
| 19 | + # Check for FOX 1.6 header files |
| 20 | + AC_LANG([C++]) |
| 21 | +-AC_CHECK_HEADER(fox-1.6/fx.h,,AC_MSG_ERROR("fox-1.6/fx.h not found")) |
| 22 | ++#AC_CHECK_HEADER(fox-1.6/fx.h,,AC_MSG_ERROR("fox-1.6/fx.h not found")) |
| 23 | + |
| 24 | + |
| 25 | +-# Check if fox-config exists |
| 26 | +-AC_CHECK_PROGS(FOX_CONFIG,fox-config-1.6 fox-1.6-config fox-config) |
| 27 | +-if test no"$FOX_CONFIG" = no ; then |
| 28 | +- AC_MSG_ERROR("fox-config not found") |
| 29 | +-fi |
| 30 | +- |
| 31 | + |
| 32 | + # Include flags for the FOX library |
| 33 | +-FOXCFLAGS=`$FOX_CONFIG --cflags` |
| 34 | ++FOXCFLAGS=`$PKG_CONFIG --cflags fox` |
| 35 | + CXXFLAGS="${CXXFLAGS} $FOXCFLAGS" |
| 36 | + |
| 37 | + |
| 38 | + # Check if FOX was compiled with xft support |
| 39 | +-TEST_XFT=`$FOX_CONFIG --libs | grep Xft` |
| 40 | ++TEST_XFT=yes |
| 41 | + if test "x$TEST_XFT" != "x" ; then |
| 42 | +- |
| 43 | ++ |
| 44 | + echo "checking whether FOX was compiled with Xft support... yes" |
| 45 | + |
| 46 | + # Check for FreeType2 |
| 47 | +@@ -135,7 +129,7 @@ if test "x$TEST_XFT" != "x" ; then |
| 48 | + CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H" |
| 49 | + ], AC_MSG_ERROR("Xft not found")) |
| 50 | + fi |
| 51 | +- AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found")) |
| 52 | ++ #AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found")) |
| 53 | + |
| 54 | + else |
| 55 | + echo "checking whether FOX was compiled with Xft support... no" |
| 56 | +@@ -149,28 +143,28 @@ else |
| 57 | + echo " sudo make install" |
| 58 | + echo "=============================================================================================" |
| 59 | + echo "" |
| 60 | +- AC_MSG_ERROR("missing Xft support in FOX") |
| 61 | ++ AC_MSG_ERROR("missing Xft support in FOX") |
| 62 | + fi |
| 63 | + |
| 64 | + |
| 65 | + # Check for Xlib headers |
| 66 | +-AC_CHECK_HEADER(X11/Xlib.h,,AC_MSG_ERROR("Xlib.h not found")) |
| 67 | ++#AC_CHECK_HEADER(X11/Xlib.h,,AC_MSG_ERROR("Xlib.h not found")) |
| 68 | + |
| 69 | + # Check for XRandR support |
| 70 | + AC_MSG_CHECKING(for xrandr extension) |
| 71 | + AC_ARG_WITH(xrandr,[ --with-xrandr compile with XRandR support]) |
| 72 | + AC_MSG_RESULT([$with_xrandr]) |
| 73 | +-if test "x$with_xrandr" != "xno"; then |
| 74 | +-AC_CHECK_HEADERS(X11/extensions/Xrandr.h,CXXFLAGS="${CXXFLAGS} -DHAVE_XRANDR_H=1"; LIBS="${LIBS} -lXrandr") |
| 75 | +-fi |
| 76 | ++#if test "x$with_xrandr" != "xno"; then |
| 77 | ++#AC_CHECK_HEADERS(X11/extensions/Xrandr.h,CXXFLAGS="${CXXFLAGS} -DHAVE_XRANDR_H=1"; LIBS="${LIBS} -lXrandr") |
| 78 | ++#fi |
| 79 | + |
| 80 | + # Check for libPNG |
| 81 | + AC_CHECK_LIB(png, png_read_info,,AC_MSG_ERROR("libPNG not found")) |
| 82 | +-AC_CHECK_HEADER(png.h,,AC_MSG_ERROR("png.h not found")) |
| 83 | ++#AC_CHECK_HEADER(png.h,,AC_MSG_ERROR("png.h not found")) |
| 84 | + |
| 85 | + # Check for fontconfig |
| 86 | + AC_CHECK_LIB(fontconfig, FcInit,, AC_MSG_ERROR("fontconfig not found")) |
| 87 | +-AC_CHECK_HEADER(fontconfig/fontconfig.h,,AC_MSG_ERROR("fontconfig.h not found")) |
| 88 | ++#AC_CHECK_HEADER(fontconfig/fontconfig.h,,AC_MSG_ERROR("fontconfig.h not found")) |
| 89 | + |
| 90 | + # Check for startup notification support |
| 91 | + AC_MSG_CHECKING(for startup notification) |
| 92 | +diff --git xfe-clean/src/ArchInputDialog.cpp xfe-workdir/src/ArchInputDialog.cpp |
| 93 | +index f0314bb..4b6e170 100644 |
| 94 | +--- xfe-clean/src/ArchInputDialog.cpp |
| 95 | ++++ xfe-workdir/src/ArchInputDialog.cpp |
| 96 | +@@ -1,5 +1,6 @@ |
| 97 | + // Input dialog for the add to archive command |
| 98 | + |
| 99 | ++#include <stdlib.h> |
| 100 | + #include "config.h" |
| 101 | + #include "i18n.h" |
| 102 | + |
| 103 | +diff --git xfe-clean/src/Bookmarks.cpp xfe-workdir/src/Bookmarks.cpp |
| 104 | +index 241ef32..113c503 100644 |
| 105 | +--- xfe-clean/src/Bookmarks.cpp |
| 106 | ++++ xfe-workdir/src/Bookmarks.cpp |
| 107 | +@@ -1,5 +1,6 @@ |
| 108 | + // Bookmarks list. Taken from the FOX library (FXRecentFiles) and slightly modified. |
| 109 | + |
| 110 | ++#include <stdlib.h> |
| 111 | + #include "config.h" |
| 112 | + #include "i18n.h" |
| 113 | + |
| 114 | +diff --git xfe-clean/src/BrowseInputDialog.cpp xfe-workdir/src/BrowseInputDialog.cpp |
| 115 | +index 4c64e68..ff0c1ad 100644 |
| 116 | +--- xfe-clean/src/BrowseInputDialog.cpp |
| 117 | ++++ xfe-workdir/src/BrowseInputDialog.cpp |
| 118 | +@@ -1,5 +1,6 @@ |
| 119 | + // Input dialog with file browse icon |
| 120 | + |
| 121 | ++#include <stdlib.h> |
| 122 | + #include "config.h" |
| 123 | + #include "i18n.h" |
| 124 | + |
0 commit comments