walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename --with-stdcpp → --with-libstdc++ 

Also improve wording a bit and fix make check in --with-libstdc++=yes.
This commit is contained in:
Khaled Hosny 2018-02-12 16:45:36 +02:00 committed by Behdad Esfahbod
parent 91f0d51f05
commit 0b94d590d9
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -57,11 +57,12 @@ m4_define([hb_libtool_current],
HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age
AC_SUBST(HB_LIBTOOL_VERSION_INFO) AC_SUBST(HB_LIBTOOL_VERSION_INFO)
AC_ARG_WITH([stdcpp], AC_ARG_WITH([libstdc++],
[AS_HELP_STRING([--with-stdcpp], [AS_HELP_STRING([--with-libstdc++=@<:@yes/no@:>@],
[Do not try suppressing linkage to libstdcpp])],, [Allow linking with libstdc++ @<:@default=no@:>@])],
[with_stdcpp=no]) [with_libstdcxx=$withval],
AM_CONDITIONAL(WITHSTDCPP, [test "x$with_stdcpp" = "xyes"]) [with_libstdcxx=no])
AM_CONDITIONAL(WITH_LIBSTDCXX, [test "x$with_libstdcxx" = "xyes"])
# Documentation # Documentation
have_gtk_doc=false have_gtk_doc=false

11
src/Makefile.am
View File

@ -30,7 +30,7 @@ HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources)
HBHEADERS = $(HB_BASE_headers) HBHEADERS = $(HB_BASE_headers)
HBNODISTHEADERS = $(HB_NODIST_headers) HBNODISTHEADERS = $(HB_NODIST_headers)
if !WITHSTDCPP if !WITH_LIBSTDCXX
# Make sure we don't link to libstdc++ # Make sure we don't link to libstdc++
HBCFLAGS += -fno-rtti -fno-exceptions HBCFLAGS += -fno-rtti -fno-exceptions
@ -128,7 +128,7 @@ export_symbols_subset = -export-symbols harfbuzz-subset.def
harfbuzz_subset_def_dependency = harfbuzz-subset.def harfbuzz_subset_def_dependency = harfbuzz-subset.def
choosed_linker = $(CXXLINK) choosed_linker = $(CXXLINK)
else else
if WITHSTDCPP if WITH_LIBSTDCXX
choosed_linker = $(CXXLINK) choosed_linker = $(CXXLINK)
else else
if HAVE_GCC if HAVE_GCC
@ -340,11 +340,16 @@ dist_check_SCRIPTS = \
check-externs.sh \ check-externs.sh \
check-header-guards.sh \ check-header-guards.sh \
check-includes.sh \ check-includes.sh \
check-libstdc++.sh \
check-static-inits.sh \ check-static-inits.sh \
check-symbols.sh \ check-symbols.sh \
$(NULL) $(NULL)
if !WITH_LIBSTDCXX
dist_check_SCRIPTS += \
check-libstdc++.sh \
$(NULL)
endif
check_PROGRAMS = \ check_PROGRAMS = \
test-ot-tag \ test-ot-tag \
$(NULL) $(NULL)