summaryrefslogtreecommitdiff
path: root/lib/Makefile.am
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-03 20:50:11 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-03 20:50:11 +0100
commit4cf52fc0bc3b80c0ef6c58c5db4413ebdafe661c (patch)
tree676b26b024117cf656080a011e3d17b8fb6889af /lib/Makefile.am
parent1ecbfbb92248e67b564f5b144c4671ccaa86ee2f (diff)
parent44ff3127b1e57b703c2a73a24f7ab38e4aad8ae4 (diff)
Merge branch 'release/0.9.8-1'0.9.8-1
Diffstat (limited to 'lib/Makefile.am')
-rw-r--r--lib/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 265ff46..11cdb1b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -91,6 +91,7 @@ EXTRA_DIST += stdbool.mini.h
# Produce an unistring/stdint.h that is not compiler dependent.
# Glibc >= 2 has <stdint.h>.
+# GCC >= 4.5 provides <stdint.h>, see https://gcc.gnu.org/gcc-4.5/changes.html.
# On most other platforms that have it, it is buggy in one way or the other.
unistring/stdint.h : $(STDINT_H) stdint.mini.h
@MKDIR_P@ unistring
@@ -103,7 +104,7 @@ unistring/stdint.h : $(STDINT_H) stdint.mini.h
if test -f /usr/include/stdint.h; then \
HAVE_STDINT_H='1'; \
else \
- HAVE_STDINT_H='defined __MINGW32__ || defined __HAIKU__'; \
+ HAVE_STDINT_H='defined __MINGW32__ || defined __HAIKU__ || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && !defined __NetBSD__)'; \
fi; \
if test -f /usr/include/inttypes.h; then \
HAVE_INTTYPES_H='1'; \
@@ -115,6 +116,8 @@ unistring/stdint.h : $(STDINT_H) stdint.mini.h
else \
HAVE_SYS_INTTYPES_H='0'; \
fi; \
+ sed_escape_ampersands='s/&/\\&/g'; \
+ HAVE_STDINT_H=`echo "$$HAVE_STDINT_H" | sed -e "$$sed_escape_ampersands"`; \
sed -e 's/@''HAVE_STDINT_H''@/'"$$HAVE_STDINT_H"'/g' \
-e 's|@''INCLUDE_NEXT''@|include|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@||g' \
@@ -311,9 +314,9 @@ AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1
# Libtool's library version information for libunistring.
# See the libtool documentation, section "Library interface versions".
-LTV_CURRENT=2
+LTV_CURRENT=3
LTV_REVISION=0
-LTV_AGE=0
+LTV_AGE=1
# How to build libunistring.la.
libunistring_la_LDFLAGS += \