1*4882a593SmuzhiyunFrom 968975107af5f4382e3e9410a635e32c14cea75f Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 21 Jul 2021 23:47:26 +0200 4*4882a593SmuzhiyunSubject: [PATCH] configure.ac: fix build without C++ 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFix the following build failure raised on toolchains without C++: 7*4882a593Smuzhiyun 8*4882a593Smuzhiyunchecking whether the C++ compiler works... no 9*4882a593Smuzhiyunconfigure: error: in `/home/buildroot/autobuild/run/instance-0/output-1/build/gumbo-parser-0.10.1': 10*4882a593Smuzhiyunconfigure: error: C++ compiler cannot create executables 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunFixes: 13*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/a32b5d3b959433fd5c3543661c37f80d27fbd010 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 16*4882a593Smuzhiyun[Upstream status: https://github.com/google/gumbo-parser/pull/426] 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun Makefile.am | 2 ++ 19*4882a593Smuzhiyun configure.ac | 6 +++++- 20*4882a593Smuzhiyun 2 files changed, 7 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 23*4882a593Smuzhiyunindex cb62459..5bebd92 100644 24*4882a593Smuzhiyun--- a/Makefile.am 25*4882a593Smuzhiyun+++ b/Makefile.am 26*4882a593Smuzhiyun@@ -105,7 +105,9 @@ gumbo_test_DEPENDENCIES += check-local 27*4882a593Smuzhiyun gumbo_test_LDADD += gtest/lib/libgtest.la gtest/lib/libgtest_main.la 28*4882a593Smuzhiyun endif 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun+if HAVE_EXAMPLES 31*4882a593Smuzhiyun noinst_PROGRAMS = clean_text find_links get_title positions_of_class benchmark serialize prettyprint 32*4882a593Smuzhiyun+endif 33*4882a593Smuzhiyun LDADD = libgumbo.la 34*4882a593Smuzhiyun AM_CPPFLAGS = -I"$(srcdir)/src" 35*4882a593Smuzhiyun 36*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 37*4882a593Smuzhiyunindex 32dc9b9..172a36b 100644 38*4882a593Smuzhiyun--- a/configure.ac 39*4882a593Smuzhiyun+++ b/configure.ac 40*4882a593Smuzhiyun@@ -9,8 +9,8 @@ AC_CONFIG_SRCDIR([src/parser.c]) 41*4882a593Smuzhiyun AC_CONFIG_FILES([Makefile gumbo.pc]) 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun # Checks for programs. 44*4882a593Smuzhiyun-AC_PROG_CXX 45*4882a593Smuzhiyun AC_PROG_CC_C99 46*4882a593Smuzhiyun+AC_PROG_CXX 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun # Checks for libraries. 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun@@ -27,6 +27,10 @@ AC_CHECK_LIB([gtest_main], 51*4882a593Smuzhiyun AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [true]), 52*4882a593Smuzhiyun AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [false])) 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun+AC_ARG_ENABLE([examples], 55*4882a593Smuzhiyun+ AS_HELP_STRING([--disable-examples], [Disable examples])) 56*4882a593Smuzhiyun+AM_CONDITIONAL([HAVE_EXAMPLES], [test "x$enable_examples" != "xno"]) 57*4882a593Smuzhiyun+ 58*4882a593Smuzhiyun # Init Automake & libtool 59*4882a593Smuzhiyun AM_INIT_AUTOMAKE([foreign subdir-objects]) 60*4882a593Smuzhiyun m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 61*4882a593Smuzhiyun-- 62*4882a593Smuzhiyun2.30.2 63*4882a593Smuzhiyun 64