diff options
| -rwxr-xr-x | configure.in | 21 | ||||
| -rwxr-xr-x | set_soenv.in | 24 |
2 files changed, 0 insertions, 45 deletions
diff --git a/configure.in b/configure.in index 3a478d36034f..0e1df635224b 100755 --- a/configure.in +++ b/configure.in @@ -1168,17 +1168,6 @@ AC_ARG_WITH(poor-help-localizations, ], ,) -AC_ARG_WITH(dict, - AS_HELP_STRING([--with-dict], - [Use this option to build LibreOffice with dictionary support. - ALL dictionaries are always included by default unless overridden with this option. - Separate multiple dictionaries with commas. - For all dictionaries, use --with-dict=ALL.]) - [ - Usage: --with-dict=ENGB,ENUS,ITIT - ], -,) - AC_ARG_WITH(intro-bitmap, [ --with-intro-bitmap Prefer the specified intro bitmap over the the default one. @@ -7751,16 +7740,6 @@ else fi AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS) -AC_MSG_CHECKING([which dictionaries to include]) -if test -z "$with_dict"; then - WITH_DICT=,ALL, - AC_MSG_RESULT([ALL]) -else - WITH_DICT=","$with_dict"," - AC_MSG_RESULT([$with_dict]) -fi -AC_SUBST(WITH_DICT) - AC_MSG_CHECKING([for another 'intro' bitmap]) INTRO_BITMAP= if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then diff --git a/set_soenv.in b/set_soenv.in index 9a43629151a6..450f9faf0b65 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -48,7 +48,6 @@ my ( $outfile, $bootfile, $newline, $comment, #------------------------------------------------- # # Platform independent constant values. -my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "HUHU", "ITIT", "RURU", "THTH", "SWTZ" ); my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG, $common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA, $SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL, @@ -1576,29 +1575,6 @@ ToFile( "Empty", $empty, "n" ); # Writing the platform independent constant values to file. # (c = comment, e = environment variable, a = alias ) ToFile( "Platform independent constant values.", $empty, "c" ); -# dictionaries -if ('@WITH_DICT@' =~ m/ALL,/s) -{ - foreach $dict (@DICTIONARIES) - { - ToFile( "DIC_$dict", "TRUE", "e" ); - } - ToFile( "DIC_ALL", "TRUE", "e" ); -} -else -{ - foreach $dict (@DICTIONARIES) - { if ('@WITH_DICT@' =~ m/$dict,/s) - { my $val="TRUE"; - ToFile( "DIC_$dict", $val, "e" ); - } - else - { my $val; - undef $val; - ToFile( "DIC_$dict", $val, "e" ); - } - } -} # Languages ToFile( "WITH_LANG", "@WITH_LANG@", "e" ); ToFile( "INTRO_BITMAP", "@INTRO_BITMAP@", "e" ); |