diff --git a/meson.build b/meson.build index 881e69df..d019ad58 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,7 @@ disable_ansi_option = get_option('disable_ansi_option') disable_posix_option = get_option('disable_posix_option') disable_linux_option = get_option('disable_linux_option') disable_iconv_option = get_option('disable_iconv_option') +disable_intl_option = get_option('disable_intl_option') internal_conf = configuration_data() if not headers_only @@ -141,6 +142,10 @@ if not disable_iconv_option libc_include_dirs += include_directories('options/iconv/include') endif +if not disable_intl_option + libc_include_dirs += include_directories('options/intl/include') +endif + rtdl_include_dirs += include_directories('options/elf/include') rtdl_include_dirs += include_directories('options/linux/include') libc_include_dirs += include_directories('options/elf/include') @@ -223,6 +228,7 @@ subdir('options/lsb') subdir('options/glibc') subdir('options/linux') subdir('options/iconv') +subdir('options/intl') if not headers_only if not static diff --git a/meson_options.txt b/meson_options.txt index 52e9b761..5a0fb303 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,3 +6,4 @@ option('disable_ansi_option', type: 'boolean', value : false) option('disable_posix_option', type: 'boolean', value : false) option('disable_linux_option', type: 'boolean', value : false) option('disable_iconv_option', type: 'boolean', value : false) +option('disable_intl_option', type: 'boolean', value : false) diff --git a/options/posix/generic/libintl-stubs.cpp b/options/intl/generic/libintl-stubs.cpp similarity index 100% rename from options/posix/generic/libintl-stubs.cpp rename to options/intl/generic/libintl-stubs.cpp diff --git a/options/posix/include/libintl.h b/options/intl/include/libintl.h similarity index 100% rename from options/posix/include/libintl.h rename to options/intl/include/libintl.h diff --git a/options/intl/meson.build b/options/intl/meson.build new file mode 100644 index 00000000..94057f4c --- /dev/null +++ b/options/intl/meson.build @@ -0,0 +1,12 @@ +if disable_intl_option + subdir_done() +endif +libc_sources += files( + 'generic/libintl-stubs.cpp', +) + +if not no_headers + install_headers( + 'include/libintl.h', + ) +endif diff --git a/options/posix/meson.build b/options/posix/meson.build index e2e52cd6..94190e30 100644 --- a/options/posix/meson.build +++ b/options/posix/meson.build @@ -48,7 +48,6 @@ libc_sources += files( 'generic/unistd-stubs.cpp', 'generic/utime-stubs.cpp', 'generic/semaphore-stubs.cpp', - 'generic/libintl-stubs.cpp', 'generic/crypt-stubs.cpp', 'generic/search.cpp', 'generic/sys-msg.cpp', @@ -83,7 +82,6 @@ if not no_headers 'include/unistd.h', 'include/utime.h', 'include/semaphore.h', - 'include/libintl.h', 'include/crypt.h', ) install_headers(