diff options
Diffstat (limited to 'packages/icewm/icewm-1.2.20/configure.patch')
-rw-r--r-- | packages/icewm/icewm-1.2.20/configure.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/packages/icewm/icewm-1.2.20/configure.patch b/packages/icewm/icewm-1.2.20/configure.patch deleted file mode 100644 index d6071bf260..0000000000 --- a/packages/icewm/icewm-1.2.20/configure.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- icewm-1.2.20/configure.in.orig 2006-06-17 18:03:43.000000000 -0600 -+++ icewm-1.2.20/configure.in 2006-06-17 18:03:45.000000000 -0600 -@@ -426,32 +426,43 @@ - AC_MSG_ERROR("xfreetype or core fonts must be enabled") - fi - if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then -- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) -- if test "${XFT_CONFIG}" != ""; then -- XFT_CFLAGS=`${XFT_CONFIG} --cflags` -- XFT_LIBS=`${XFT_CONFIG} --libs` -- AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.]) -- CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS" -- CORE_LIBS="${CORE_LIBS} $XFT_LIBS" -- features="${features} xfreetype" -- else -- AC_CHECK_HEADERS(X11/Xft/Xft.h, -- [ AC_CHECK_LIB(Xft, XftDrawCreate, -- [ AC_DEFINE(CONFIG_XFREETYPE, 1, [Define to enable XFreeType support.]) -- CORE_LIBS="${CORE_LIBS} -lXft" -- enable_corefonts=yes -- features="${features} xfreetype" ], -- [ if test "$enable_xfreetype" != "implied"; then -- AC_MSG_ERROR([Xft support has been requested but libraries were not found. -+ AC_PATH_PROG(PKG_CONFIG, pkg-config) -+ -+ if test "${PKG_CONFIG}" != ""; then -+ XFT_CFLAGS=`${PKG_CONFIG} xft --cflags` -+ XFT_LIBS=`${PKG_CONFIG} xft --libs` -+ AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.]) -+ CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS" -+ CORE_LIBS="${CORE_LIBS} $XFT_LIBS" -+ features="${features} xfreetype" -+ else -+ AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) -+ if test "${XFT_CONFIG}" != ""; then -+ XFT_CFLAGS=`${XFT_CONFIG} --cflags` -+ XFT_LIBS=`${XFT_CONFIG} --libs` -+ AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.]) -+ CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS" -+ CORE_LIBS="${CORE_LIBS} $XFT_LIBS" -+ features="${features} xfreetype" -+ else -+ AC_CHECK_HEADERS(X11/Xft/Xft.h, -+ [ AC_CHECK_LIB(Xft, XftDrawCreate, -+ [ AC_DEFINE(CONFIG_XFREETYPE, 1, [Define to enable XFreeType support.]) -+ CORE_LIBS="${CORE_LIBS} -lXft" -+ enable_corefonts=yes -+ features="${features} xfreetype" ], -+ [ if test "$enable_xfreetype" != "implied"; then -+ AC_MSG_ERROR([Xft support has been requested but libraries were not found. - *** Configure your X server to support XFreeType. - *** Information about how to do this can be found in RELNOTES for XFree86.]) -- fi ])], -- [ if test "$enable_xfreetype" != "implied"; then -- AC_MSG_ERROR([Xft support has been requested but headers were not found. -+ fi ])], -+ [ if test "$enable_xfreetype" != "implied"; then -+ AC_MSG_ERROR([Xft support has been requested but headers were not found. - *** Configure your X server to support XFreeType. - *** Information about how to do this can be found in RELNOTES for XFree86.]) -- fi ]) -- fi -+ fi ]) -+ fi -+ fi - fi - - if test "$enable_corefonts" = "yes"; then |