Signed-off-by: Denis Kozadaev <denis@dilos.org>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a4f44d553c
)
r14.1.x
parent
c9dcbc21dd
commit
4682d07bdc
@ -0,0 +1,46 @@
|
||||
Index: imlib-1.9.15/Imlib/colors.c
|
||||
===================================================================
|
||||
--- imlib-1.9.15.orig/Imlib/colors.c
|
||||
+++ imlib-1.9.15/Imlib/colors.c
|
||||
@@ -3,8 +3,10 @@
|
||||
#include "Imlib.h"
|
||||
#include "Imlib_private.h"
|
||||
|
||||
-#ifndef HAVE_BASENAME
|
||||
+#if defined(HAVE_GNU_BASENAME)
|
||||
#include <string.h>
|
||||
+#elif defined(HAVE_BASENAME)
|
||||
+#include <libgen.h>
|
||||
#endif
|
||||
|
||||
#ifdef __EMX__
|
||||
Index: imlib-1.9.15/config.h.in
|
||||
===================================================================
|
||||
--- imlib-1.9.15.orig/config.h.in
|
||||
+++ imlib-1.9.15/config.h.in
|
||||
@@ -19,6 +19,9 @@
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
+/* Defined if we hare GNU version of basename */
|
||||
+#undef HAVE_GNU_BASENAME
|
||||
+
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
Index: imlib-1.9.15/configure.in
|
||||
===================================================================
|
||||
--- imlib-1.9.15.orig/configure.in
|
||||
+++ imlib-1.9.15/configure.in
|
||||
@@ -101,6 +101,11 @@ AC_TYPE_SIGNAL
|
||||
AC_CHECK_FUNCS(vsnprintf)
|
||||
AC_CHECK_FUNCS(snprintf)
|
||||
AC_CHECK_FUNCS(basename)
|
||||
+AC_CHECK_DECL([basename(char*)], AC_DEFINE(HAVE_GNU_BASENAME, 1, [Defined if we hare GNU version of basename]), [], [
|
||||
+#define _GNU_SOURCE
|
||||
+#include <string.h>
|
||||
+])
|
||||
+
|
||||
|
||||
AC_CHECK_FUNCS(blumfrub)
|
||||
AC_CHECK_FUNCS(buckets_of_erogenous_nym)
|
Loading…
Reference in new issue