diff options
| -rwxr-xr-x | autogen.sh | 31 | ||||
| -rw-r--r-- | examples/rcc-example.xml | 4 | ||||
| -rw-r--r-- | ui/rccnames.c | 2 |
3 files changed, 6 insertions, 31 deletions
@@ -99,7 +99,7 @@ compare_versions() { } REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} -FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-} + require_m4macro() { case "$REQUIRED_M4MACROS" in $1\ * | *\ $1\ * | *\ $1) ;; @@ -107,13 +107,6 @@ require_m4macro() { esac } -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - add_to_cm_macrodirs() { case $cm_macrodirs in "$1 "* | *" $1 "* | *" $1") ;; @@ -180,28 +173,10 @@ check_m4macros() { fi done fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi if [ "$cm_status" != 0 ]; then printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" + printerr " were not found in your aclocal path." + printerr " Perhaps you need to adjust your ACLOCAL_FLAGS?" printerr fi return $cm_status diff --git a/examples/rcc-example.xml b/examples/rcc-example.xml index 8dc068c..68f3351 100644 --- a/examples/rcc-example.xml +++ b/examples/rcc-example.xml @@ -50,7 +50,7 @@ <FullName>Recodings Cache</FullName> <FullName locale="ru">Кэширование</FullName> <Value name="OFF"> - <FullName>Dissable</FullName> + <FullName>Disable</FullName> <FullName locale="ru">Выключено</FullName> </Value> <Value name="ON"> @@ -159,4 +159,4 @@ </Frames> </Page> </Pages> -</LibRCC>
\ No newline at end of file +</LibRCC> diff --git a/ui/rccnames.c b/ui/rccnames.c index dd26975..7012351 100644 --- a/ui/rccnames.c +++ b/ui/rccnames.c @@ -29,7 +29,7 @@ rcc_name rcc_default_language_names[RCC_MAX_LANGUAGES+1]; rcc_name rcc_default_language_names_embeded[RCC_MAX_LANGUAGES+1] = { {"default", "Autodetect"}, -{"off", "Dissable"}, +{"off", "Disable"}, {"en", "English" }, {"ru","Russian"}, {"uk","Ukrainian"}, |