# HG changeset patch # User Mike Becker # Date 1731426807 -3600 # Node ID 5706694c17c45b1128b57453f7944808d48b1704 # Parent 155cd224b51d5881078f65bcba00a0d04eab6798 fix configure not emitting target data for features - fixes #478 diff -r 155cd224b51d -r 5706694c17c4 src/main/resources/make/configure.vm --- a/src/main/resources/make/configure.vm Sat Nov 02 14:23:45 2024 +0100 +++ b/src/main/resources/make/configure.vm Tue Nov 12 16:53:27 2024 +0100 @@ -568,6 +568,18 @@ unset ${feature.varName} fi fi +if [ -n "${D}${feature.varName}" ]; then + : +#foreach( $def in $feature.defines ) + TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}" + TEMP_CXXFLAGS="$TEMP_CXXFLAGS ${def.toFlags()}" +#end +#if( $feature.hasMake() ) + cat >> "$TEMP_DIR/make.mk" << __EOF__ +$feature.make +__EOF__ +#end +fi #end #foreach( $opt in $target.options ) diff -r 155cd224b51d -r 5706694c17c4 test/configure --- a/test/configure Sat Nov 02 14:23:45 2024 +0100 +++ b/test/configure Tue Nov 12 16:53:27 2024 +0100 @@ -582,6 +582,9 @@ unset FEATURE_PG fi fi +if [ -n "$FEATURE_PG" ]; then + : +fi if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then diff -r 155cd224b51d -r 5706694c17c4 test/configure2 --- a/test/configure2 Sat Nov 02 14:23:45 2024 +0100 +++ b/test/configure2 Tue Nov 12 16:53:27 2024 +0100 @@ -650,6 +650,11 @@ unset FEATURE_DB fi fi +if [ -n "$FEATURE_DB" ]; then + : + TEMP_CFLAGS="$TEMP_CFLAGS -DDATABASE" + TEMP_CXXFLAGS="$TEMP_CXXFLAGS -DDATABASE" +fi if [ -n "$FEATURE_GUI" ]; then # check dependency if dependency_error_gtk3 ; then @@ -665,6 +670,11 @@ unset FEATURE_GUI fi fi +if [ -n "$FEATURE_GUI" ]; then + : + TEMP_CFLAGS="$TEMP_CFLAGS -DUI=GTK3" + TEMP_CXXFLAGS="$TEMP_CXXFLAGS -DUI=GTK3" +fi # Option: --toolkit if [ -z "$OPT_TOOLKIT" ]; then diff -r 155cd224b51d -r 5706694c17c4 test/make/configure.vm --- a/test/make/configure.vm Sat Nov 02 14:23:45 2024 +0100 +++ b/test/make/configure.vm Tue Nov 12 16:53:27 2024 +0100 @@ -568,6 +568,18 @@ unset ${feature.varName} fi fi +if [ -n "${D}${feature.varName}" ]; then + : +#foreach( $def in $feature.defines ) + TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}" + TEMP_CXXFLAGS="$TEMP_CXXFLAGS ${def.toFlags()}" +#end +#if( $feature.hasMake() ) + cat >> "$TEMP_DIR/make.mk" << __EOF__ +$feature.make +__EOF__ +#end +fi #end #foreach( $opt in $target.options )