Hide Diff Patch Unified Diff

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch configurefix Excluding Merge-Ins

This is equivalent to a diff from 26cf441c85 to 952341c0d9

2018-07-12
21:04
Fix configure in case of --enable-html5 and gumbo installed in non-standard places. Plus other small corrections and improvements related to configure --enable-html5. check-in: 2b88599435 user: rolf tags: trunk
21:01
Only one AC_MSG_ERROR line makes sense for obvious reason. Closed-Leaf check-in: 952341c0d9 user: rolf tags: configurefix
19:57
Fix configure in case gumbo is installed in non-standard places. Plus other small corrections and improvents related to --enable-html5. check-in: a230fd334b user: rolf tags: configurefix
2018-07-11
00:26
Merge trunk. check-in: 132adf28aa user: rolf tags: expat-update
00:25
Merge trunk. check-in: e40efd38e1 user: rolf tags: structure
2018-07-10
22:25
More typo fixes. Thanks goes to Gustaf Neumann. check-in: 26cf441c85 user: rolf tags: trunk
21:45
Removed code duplication. check-in: 94bf2ac99f user: rolf tags: trunk

Changes to configure.

︙︙
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388

   esac
  cat <<\_ACEOF

Optional Features:
  --disable-option-checking  ignore unrecognized --enable/--with options
  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-html5          build with HTML5 parsing support (default: no)
  --enable-threads        build with threads
  --enable-shared         build and link with shared libraries (default: on)
  --enable-stubs          build and link with stub libraries. Always true for
                          shared builds (default: on)
  --enable-64bit          enable 64bit support (default: off)
  --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
  --disable-rpath         disable rpath support (default: on)








|








1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388

   esac
  cat <<\_ACEOF

Optional Features:
  --disable-option-checking  ignore unrecognized --enable/--with options
  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-html5          build with HTML5 parsing support (default: off)
  --enable-threads        build with threads
  --enable-shared         build and link with shared libraries (default: on)
  --enable-stubs          build and link with stub libraries. Always true for
                          shared builds (default: on)
  --enable-64bit          enable 64bit support (default: off)
  --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
  --disable-rpath         disable rpath support (default: on)
︙︙
5540
5541
5542
5543
5544
5545
5546











5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558

5559
5560
5561
5562
5563
5564
5565

    if test "${enable_html5+set}" = set; then
        enableval="$enable_html5"
        tcl_ok=$enableval
    else
        tcl_ok=no
    fi
    HTML5_LIBS=""











    if test "$tcl_ok" = "yes" ; then
        HAVEGUMBO=`pkg-config --exists gumbo && echo "1"`
        if test "$HAVEGUMBO" = "1" ; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
            $as_echo "#define TDOM_HAVE_GUMBO 1" >>confdefs.h

            if test "${TEA_PLATFORM}" = "windows" ; then
                HTML5_LIBS="-Wl,-Bstatic `pkg-config --static --cflags --libs gumbo` -Wl,-Bdynamic"
            else
                HTML5_LIBS="`pkg-config --cflags --libs gumbo`"
            fi

        else
            as_fn_error $? "The required lib gumbo not found" "$LINENO" 5
        fi
    else
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
    fi








>
>
>
>
>
>
>
>
>
>
>








|

|

>








5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577

    if test "${enable_html5+set}" = set; then
        enableval="$enable_html5"
        tcl_ok=$enableval
    else
        tcl_ok=no
    fi
    HTML5_LIBS=""
    HTML5_INCLUDES=""
    if test "$tcl_ok" = "yes" ; then
        # Check if pkg-config is available
        PKGCONFIG=no
        pkg-config --version > /dev/null 2>&1 && PKGCONFIG=yes
        if test "$PKGCONFIG" = no; then
            tcl_ok=no
	    as_fn_error $? "**** Cannot find pkg-config needed for --enable-html5." "$LINENO" 5
	    as_fn_error $? "**** Despite configure request HTML5 parser _NOT_ enabled." "$LINENO" 5
        fi
    fi
    if test "$tcl_ok" = "yes" ; then
        HAVEGUMBO=`pkg-config --exists gumbo && echo "1"`
        if test "$HAVEGUMBO" = "1" ; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
            $as_echo "#define TDOM_HAVE_GUMBO 1" >>confdefs.h

            if test "${TEA_PLATFORM}" = "windows" ; then
                HTML5_LIBS="-Wl,-Bstatic `pkg-config --static --libs gumbo` -Wl,-Bdynamic"
            else
                HTML5_LIBS="`pkg-config --libs gumbo`"
            fi
            HTML5_INCLUDES="`pkg-config --cflags gumbo`"
        else
            as_fn_error $? "The required lib gumbo not found" "$LINENO" 5
        fi
    else
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
    fi
︙︙
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645

	    as_fn_error $? "could not find header file '${srcdir}/$i'" "$LINENO" 5
	fi
	PKG_HEADERS="$PKG_HEADERS $i"
    done



    vars="-I${srcdir}/generic ${AOL_INCLUDES}"
    for i in $vars; do
	PKG_INCLUDES="$PKG_INCLUDES $i"
    done



    vars="${AOL_LIBS} ${HTML5_LIBS}"








|








5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657

	    as_fn_error $? "could not find header file '${srcdir}/$i'" "$LINENO" 5
	fi
	PKG_HEADERS="$PKG_HEADERS $i"
    done



    vars="-I${srcdir}/generic ${AOL_INCLUDES} ${HTML5_INCLUDES}"
    for i in $vars; do
	PKG_INCLUDES="$PKG_INCLUDES $i"
    done



    vars="${AOL_LIBS} ${HTML5_LIBS}"
︙︙

Changes to configure.in.

︙︙
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120

                 generic/tcldom.c    \
                 generic/nodecmd.c   \
                 generic/tdominit.c  \
                 generic/tclexpat.c  \
                 generic/tclpull.c   \
                 generic/tdomStubInit.c])
TEA_ADD_HEADERS([generic/tdom.h])
TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
TEA_ADD_LIBS([${AOL_LIBS} ${HTML5_LIBS}])
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
TEA_ADD_TCL_SOURCES([lib/tdom.tcl])

#--------------------------------------------------------------------
# __CHANGE__








|








106
107
108
109
110
111
112
113
114
115
116
117
118
119
120

                 generic/tcldom.c    \
                 generic/nodecmd.c   \
                 generic/tdominit.c  \
                 generic/tclexpat.c  \
                 generic/tclpull.c   \
                 generic/tdomStubInit.c])
TEA_ADD_HEADERS([generic/tdom.h])
TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES} ${HTML5_INCLUDES}])
TEA_ADD_LIBS([${AOL_LIBS} ${HTML5_LIBS}])
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
TEA_ADD_TCL_SOURCES([lib/tdom.tcl])

#--------------------------------------------------------------------
# __CHANGE__
︙︙

Changes to tdom.m4.

︙︙
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240










241
242
243
244
245
246
247
248
249
250

251
252
253
254
255
256
257

#
#------------------------------------------------------------------------

AC_DEFUN(TDOM_ENABLE_HTML5, [
    AC_MSG_CHECKING([whether to enable support for HTML5 parsing (using gumbo)])
    AC_ARG_ENABLE(html5,
        AC_HELP_STRING([--enable-html5],
            [build with HTML5 parsing support (default: no)]),
        [tcl_ok=$enableval], [tcl_ok=no])

    if test "${enable_html5+set}" = set; then
        enableval="$enable_html5"
        tcl_ok=$enableval
    else
        tcl_ok=no
    fi
    HTML5_LIBS=""










    if test "$tcl_ok" = "yes" ; then
        HAVEGUMBO=`pkg-config --exists gumbo && echo "1"`
        if test "$HAVEGUMBO" = "1" ; then
            AC_MSG_RESULT([yes])
            AC_DEFINE(TDOM_HAVE_GUMBO)
            if test "${TEA_PLATFORM}" = "windows" ; then
                HTML5_LIBS="-Wl,-Bstatic `pkg-config --static --cflags --libs gumbo` -Wl,-Bdynamic"
            else
                HTML5_LIBS="`pkg-config --cflags --libs gumbo`"
            fi

        else
            AC_MSG_ERROR([The required lib gumbo not found])
        fi
    else    
        AC_MSG_RESULT([no])
    fi
])








|









>
>
>
>
>
>
>
>
>
>






|

|

>








224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268

#
#------------------------------------------------------------------------

AC_DEFUN(TDOM_ENABLE_HTML5, [
    AC_MSG_CHECKING([whether to enable support for HTML5 parsing (using gumbo)])
    AC_ARG_ENABLE(html5,
        AC_HELP_STRING([--enable-html5],
            [build with HTML5 parsing support (default: off)]),
        [tcl_ok=$enableval], [tcl_ok=no])

    if test "${enable_html5+set}" = set; then
        enableval="$enable_html5"
        tcl_ok=$enableval
    else
        tcl_ok=no
    fi
    HTML5_LIBS=""
    HTML5_INCLUDES=""
    if test "$tcl_ok" = "yes" ; then
        # Check if pkg-config is available
        PKGCONFIG=no
        pkg-config --version > /dev/null 2>&1 && PKGCONFIG=yes
        if test "$PKGCONFIG" = no; then
            tcl_ok=no
	    AC_MSG_ERROR([cannot find pkg-config needed for --enable-html5.])
        fi
    fi
    if test "$tcl_ok" = "yes" ; then
        HAVEGUMBO=`pkg-config --exists gumbo && echo "1"`
        if test "$HAVEGUMBO" = "1" ; then
            AC_MSG_RESULT([yes])
            AC_DEFINE(TDOM_HAVE_GUMBO)
            if test "${TEA_PLATFORM}" = "windows" ; then
                HTML5_LIBS="-Wl,-Bstatic `pkg-config --static --libs gumbo` -Wl,-Bdynamic"
            else
                HTML5_LIBS="`pkg-config --libs gumbo`"
            fi
            HTML5_INCLUDES="`pkg-config --cflags gumbo`"
        else
            AC_MSG_ERROR([The required lib gumbo not found])
        fi
    else    
        AC_MSG_RESULT([no])
    fi
])
︙︙

Fossil 2.19 [1e131febd3] 2022-07-21 16:10:55
This page was generated in about 0.016s