Index: tcc4tcl/build.sh ================================================================== --- tcc4tcl/build.sh +++ tcc4tcl/build.sh @@ -9,11 +9,11 @@ echo 'ERROR: The TCLVERS environment variable is not set' >&2 exit 1 fi -TCC4TCLVERS="0.11" +TCC4TCLVERS="0.13" SRC="src/tcc4tcl-${TCC4TCLVERS}.tar.gz" SRCURL="http://rkeene.org/devel/tcc4tcl/tcc4tcl-${TCC4TCLVERS}.tar.gz" BUILDDIR="$(pwd)/build/tcc4tcl-${TCC4TCLVERS}" OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" @@ -75,10 +75,16 @@ tryopts="--enable-shared" else # Default to building statically tryopts="--disable-shared" fi + + if echo " ${CONFIGUREEXTRA} " | grep ' --disable-load ' >/dev/null; then + dlopen_flag="--with-dlopen" + else + dlopen_flag="--without-dlopen" + fi SAVE_CFLAGS="${CFLAGS}" for tryopt in $tryopts __fail__; do # Clean up, if needed make distclean >/dev/null 2>/dev/null @@ -102,12 +108,12 @@ else CFLAGS="${SAVE_CFLAGS}" fi ( - echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" - ./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} + echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${dlopen_flag} ${CONFIGUREEXTRA}" + ./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${dlopen_flag} ${CONFIGUREEXTRA} echo "Running: ${MAKE:-make}" ${MAKE:-make} || exit 1 echo "Running: ${MAKE:-make} install"