From 6bfd0420c2bdea2e4a7f6db0ddf21690e3c09b73 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 12 May 2024 07:35:55 +0200 Subject: [PATCH] Applied updates --- .github/workflows/build.yml | 31 +- .github/workflows/build_freebsd.yml | 2 +- .github/workflows/build_shared.yml | 2 +- acinclude.m4 | 2 +- common/Makefile.am | 2 +- configure.ac | 2 +- m4/common.m4 | 214 ++++-- m4/libcerror.m4 | 83 +- m4/libclocale.m4 | 79 +- m4/libuna.m4 | 1087 +++++---------------------- msvscpp/libcdirectory.sln | 18 +- msvscpp/libuna/libuna.vcproj | 144 ++++ 12 files changed, 527 insertions(+), 1139 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a0fe34..1a9a3f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: compiler: 'gcc' configure_options: '--enable-wide-character-type' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: | sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config @@ -39,6 +39,30 @@ jobs: - name: Run tests run: | tests/runtests.sh + build_dist: + runs-on: ubuntu-22.04 + strategy: + matrix: + include: + - architecture: 'x64' + compiler: 'gcc' + configure_options: '' + steps: + - uses: actions/checkout@v4 + - name: Install build dependencies + run: | + sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config + - name: Download test data + run: | + if test -x "synctestdata.sh"; then ./synctestdata.sh; fi + - name: Building from source + env: + CC: ${{ matrix.compiler }} + run: | + tests/build.sh ${{ matrix.configure_options }} + - name: Run tests + run: | + make distcheck coverage_ubuntu: runs-on: ubuntu-22.04 strategy: @@ -51,7 +75,7 @@ jobs: compiler: 'gcc' configure_options: '--enable-wide-character-type' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: | sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config @@ -72,6 +96,7 @@ jobs: (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) \ done - name: Upload coverage report to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: name: linux-${{ matrix.architecture }}-gcc-no-optimization + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/build_freebsd.yml b/.github/workflows/build_freebsd.yml index 53b87c8..b0b664c 100644 --- a/.github/workflows/build_freebsd.yml +++ b/.github/workflows/build_freebsd.yml @@ -6,7 +6,7 @@ jobs: build_freebsd: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Building from source id: build_freebsd uses: vmactions/freebsd-vm@v1 diff --git a/.github/workflows/build_shared.yml b/.github/workflows/build_shared.yml index d0bff2f..44031f0 100644 --- a/.github/workflows/build_shared.yml +++ b/.github/workflows/build_shared.yml @@ -17,7 +17,7 @@ jobs: compiler: 'gcc' configure_options: '--enable-wide-character-type' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: | sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config diff --git a/acinclude.m4 b/acinclude.m4 index 7bda51c..e5b13d7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,6 @@ dnl Checks for required headers and functions dnl -dnl Version: 20190308 +dnl Version: 20240413 dnl Function to detect if libcdirectory dependencies are available AC_DEFUN([AX_LIBCDIRECTORY_CHECK_LOCAL], diff --git a/common/Makefile.am b/common/Makefile.am index 18c6783..f7aa524 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = \ - -I../include -I../include -I$(top_srcdir)/include + -I../include -I$(top_srcdir)/include EXTRA_DIST = \ byte_stream.h \ diff --git a/configure.ac b/configure.ac index fa261dd..dbfa720 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.71]) AC_INIT( [libcdirectory], - [20240414], + [20240512], [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( diff --git a/m4/common.m4 b/m4/common.m4 index 71c18b8..0660d71 100644 --- a/m4/common.m4 +++ b/m4/common.m4 @@ -1,11 +1,10 @@ dnl Checks for common headers and functions dnl -dnl Version: 20240308 +dnl Version: 20240512 dnl Function to test if a certain feature was disabled AC_DEFUN([AX_COMMON_ARG_DISABLE], -[ - AC_ARG_ENABLE( + [AC_ARG_ENABLE( [$1], [AS_HELP_STRING( [--disable-$1], @@ -17,12 +16,11 @@ AC_DEFUN([AX_COMMON_ARG_DISABLE], [whether to disable $3], [ac_cv_enable_$2], [ac_cv_enable_$2="yes"])dnl -]) + ]) dnl Function to test if a certain feature was enabled AC_DEFUN([AX_COMMON_ARG_ENABLE], -[ - AC_ARG_ENABLE( + [AC_ARG_ENABLE( [$1], [AS_HELP_STRING( [--enable-$1], @@ -34,12 +32,11 @@ AC_DEFUN([AX_COMMON_ARG_ENABLE], [whether to enable $3], [ac_cv_enable_$2], [ac_cv_enable_$2=$4])dnl -]) + ]) dnl Function to test if the location of a certain feature was provided AC_DEFUN([AX_COMMON_ARG_WITH], -[ - AC_ARG_WITH( + [AC_ARG_WITH( [$1], [AS_HELP_STRING( [--with-$1[[=$5]]], @@ -51,21 +48,19 @@ AC_DEFUN([AX_COMMON_ARG_WITH], [whether to use $3], [ac_cv_with_$2], [ac_cv_with_$2=$4])dnl -]) + ]) -dnl Function to detect whether shared libary support should be disabled +dnl Function to detect whether shared library support should be disabled AC_DEFUN([AX_COMMON_CHECK_DISABLE_SHARED_LIBS], -[ - AX_COMMON_ARG_DISABLE( + [AX_COMMON_ARG_DISABLE( [shared-libs], [shared_libs], [disable shared library support]) -]) + ]) dnl Function to detect whether debug output should be enabled AC_DEFUN([AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT], -[ - AX_COMMON_ARG_ENABLE( + [AX_COMMON_ARG_ENABLE( [debug-output], [debug_output], [enable debug output], @@ -79,12 +74,11 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT], [Define to 1 if debug output should be used.]) ac_cv_enable_debug_output=yes]) -]) + ]) dnl Function to detect whether static executables support should be enabled AC_DEFUN([AX_COMMON_CHECK_ENABLE_STATIC_EXECUTABLES], -[ - AX_COMMON_ARG_ENABLE( + [AX_COMMON_ARG_ENABLE( [static-executables], [static_executables], [build static executables (binaries)], @@ -99,12 +93,11 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_STATIC_EXECUTABLES], ac_cv_enable_static_executables=yes enable_shared=no]) -]) + ]) dnl Function to detect whether verbose output should be enabled AC_DEFUN([AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT], -[ - AX_COMMON_ARG_ENABLE( + [AX_COMMON_ARG_ENABLE( [verbose-output], [verbose_output], [enable verbose output], @@ -118,22 +111,20 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT], [Define to 1 if verbose output should be used.]) ac_cv_enable_verbose_output=yes]) -]) + ]) dnl Function to detect whether static executables support should be enabled AC_DEFUN([AX_COMMON_CHECK_ENABLE_WIDE_CHARACTER_TYPE], -[ - AX_COMMON_ARG_ENABLE( + [AX_COMMON_ARG_ENABLE( [wide-character-type], [wide_character_type], [enable wide character type support], [no]) -]) + ]) dnl Function to detect whether WINAPI support should be enabled AC_DEFUN([AX_COMMON_CHECK_ENABLE_WINAPI], -[ - AX_COMMON_ARG_ENABLE( + [AX_COMMON_ARG_ENABLE( [winapi], [winapi], [enable WINAPI support for cross-compilation], @@ -156,13 +147,12 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_WINAPI], [detected MSYS enabling WINAPI support for cross-compilation]) ac_cv_enable_winapi=yes], [*],[ac_cv_enable_winapi=no]) + ]) ]) -]) dnl Function to detect whether printf conversion specifier "%jd" is available AC_DEFUN([AX_COMMON_CHECK_FUNC_PRINTF_JD], -[ - AC_MSG_CHECKING( + [AC_MSG_CHECKING( [whether printf supports the conversion specifier "%jd"]) SAVE_CFLAGS="$CFLAGS" @@ -187,7 +177,7 @@ AC_DEFUN([AX_COMMON_CHECK_FUNC_PRINTF_JD], [[printf( "%jd", (off_t) 10 ); ]] )], [ac_cv_cv_have_printf_jd=yes], [ac_cv_cv_have_printf_jd=no]) - ]) + ]) dnl Third try to see if the program runs correctly AS_IF( @@ -202,7 +192,7 @@ if( ( string[ 0 ] != '1' ) || ( string[ 1 ] != '0' ) ) return( 1 ); ]] )], [ac_cv_cv_have_printf_jd=yes], [ac_cv_cv_have_printf_jd=no], [ac_cv_cv_have_printf_jd=undetermined]) - ]) + ]) AC_LANG_POP(C) CFLAGS="$SAVE_CFLAGS" @@ -217,13 +207,12 @@ if( ( string[ 0 ] != '1' ) || ( string[ 1 ] != '0' ) ) return( 1 ); ]] )], [Define to 1 whether printf supports the conversion specifier "%jd".]) ], [AC_MSG_RESULT( [$ac_cv_cv_have_printf_jd]) + ]) ]) -]) dnl Function to detect whether printf conversion specifier "%zd" is available AC_DEFUN([AX_COMMON_CHECK_FUNC_PRINTF_ZD], -[ - AC_MSG_CHECKING( + [AC_MSG_CHECKING( [whether printf supports the conversion specifier "%zd"]) SAVE_CFLAGS="$CFLAGS" @@ -248,7 +237,7 @@ AC_DEFUN([AX_COMMON_CHECK_FUNC_PRINTF_ZD], [[printf( "%zd", (size_t) 10 ); ]] )], [ac_cv_cv_have_printf_zd=yes], [ac_cv_cv_have_printf_zd=no]) - ]) + ]) dnl Third try to see if the program runs correctly AS_IF( @@ -263,7 +252,7 @@ if( ( string[ 0 ] != '1' ) || ( string[ 1 ] != '0' ) ) return( 1 ); ]] )], [ac_cv_cv_have_printf_zd=yes], [ac_cv_cv_have_printf_zd=no], [ac_cv_cv_have_printf_zd=undetermined]) - ]) + ]) AC_LANG_POP(C) CFLAGS="$SAVE_CFLAGS" @@ -278,13 +267,12 @@ if( ( string[ 0 ] != '1' ) || ( string[ 1 ] != '0' ) ) return( 1 ); ]] )], [Define to 1 whether printf supports the conversion specifier "%zd".]) ], [AC_MSG_RESULT( [$ac_cv_cv_have_printf_zd]) + ]) ]) -]) dnl Function to detect if common dependencies are available AC_DEFUN([AX_COMMON_CHECK_LOCAL], -[ - dnl Headers included in common/common.h + [dnl Headers included in common/common.h AS_IF( [test "x$ac_cv_enable_winapi" = xyes], [AC_CHECK_HEADERS([windows.h]) @@ -294,13 +282,13 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], [AC_MSG_FAILURE( [Missing header: windows.h header is required to compile with winapi support], [1]) + ]) ]) - ]) AS_IF( [test "x$ac_cv_enable_winapi" = xno], [AC_CHECK_HEADERS([libintl.h]) - ]) + ]) dnl Headers included in common/types.h AC_CHECK_HEADERS([limits.h]) @@ -319,56 +307,56 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], [AC_MSG_FAILURE( [Missing function: fclose], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_feof" != xyes], [AC_MSG_FAILURE( [Missing function: feof], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_fgets" != xyes], [AC_MSG_FAILURE( [Missing function: fgets], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_fopen" != xyes], [AC_MSG_FAILURE( [Missing function: fopen], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_fread" != xyes], [AC_MSG_FAILURE( [Missing function: fread], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_fseeko" != xyes && test "x$ac_cv_func_fseeko64" != xyes], [AC_MSG_FAILURE( [Missing function: fseeko and fseeko64], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_fwrite" != xyes], [AC_MSG_FAILURE( [Missing function: fwrite], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_vfprintf" != xyes], [AC_MSG_FAILURE( [Missing function: vfprintf], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_enable_wide_character_type" != xno], @@ -379,8 +367,8 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], [AC_MSG_FAILURE( [Missing function: fgetws], [1]) + ]) ]) - ]) dnl Memory functions used in common/memory.h AC_CHECK_FUNCS([free malloc memcmp memcpy memset realloc]) @@ -390,42 +378,42 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], [AC_MSG_FAILURE( [Missing function: free], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_malloc" != xyes], [AC_MSG_FAILURE( [Missing function: malloc], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memcmp" != xyes], [AC_MSG_FAILURE( [Missing function: memcmp], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memcpy" != xyes], [AC_MSG_FAILURE( [Missing function: memcpy], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memset" != xyes], [AC_MSG_FAILURE( [Missing function: memset], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_realloc" != xyes], [AC_MSG_FAILURE( [Missing function: realloc], [1]) - ]) + ]) dnl Narrow character string functions used in common/narrow_string.h AC_CHECK_FUNCS([memchr memrchr snprintf sscanf strcasecmp strchr strlen strncasecmp strncmp strncpy strnicmp strrchr strstr vsnprintf]) @@ -435,21 +423,21 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], [AC_MSG_FAILURE( [Missing functions: memchr and strchr], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memcmp" != xyes && test "x$ac_cv_func_strncmp" != xyes], [AC_MSG_FAILURE( [Missing functions: memcmp and strncmp], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memcpy" != xyes && test "x$ac_cv_func_strncpy" != xyes], [AC_MSG_FAILURE( [Missing functions: memcpy and strncpy], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memrchr" = xyes], @@ -458,56 +446,56 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], AS_IF( [test "x$ac_cv_decl_memrchr" != xyes], [ac_cv_func_memrchr=no]) - ]) + ]) AS_IF( [test "x$ac_cv_func_memrchr" != xyes && test "x$ac_cv_func_strrchr" != xyes], [AC_MSG_FAILURE( [Missing functions: strrchr and memrchr], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_snprintf" != xyes], [AC_MSG_FAILURE( [Missing function: snprintf], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_sscanf" != xyes], [AC_MSG_FAILURE( [Missing function: sscanf], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_strlen" != xyes], [AC_MSG_FAILURE( [Missing function: strlen], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_strcasecmp" != xyes && test "x$ac_cv_func_strncasecmp" != xyes && test "x$ac_cv_func_strnicmp" != xyes], [AC_MSG_FAILURE( [Missing functions: strncasecmp, strcasecmp and strnicmp], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_strstr" != xyes], [AC_MSG_FAILURE( [Missing function: strstr], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_vsnprintf" != xyes], [AC_MSG_FAILURE( [Missing function: vsnprintf], [1]) - ]) + ]) dnl Wide character string functions used in common/wide_string.h AS_IF( @@ -519,60 +507,130 @@ AC_DEFUN([AX_COMMON_CHECK_LOCAL], [AC_MSG_FAILURE( [Missing function: swprintf], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wmemchr" != xyes && test "x$ac_cv_func_wcschr" != xyes], [AC_MSG_FAILURE( [Missing functions: wmemchr and wcschr], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wmemcmp" != xyes && test "x$ac_cv_func_wcsncmp" != xyes], [AC_MSG_FAILURE( [Missing functions: wmemcmp and wcsncmp], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wmemcpy" != xyes && test "x$ac_cv_func_wcsncpy" != xyes], [AC_MSG_FAILURE( [Missing functions: wmemcpy and wcsncpy], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wmemrchr" != xyes && test "x$ac_cv_func_wcsrchr" != xyes], [AC_MSG_FAILURE( [Missing functions: wmemrchr and wcsrchr], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wcslen" != xyes], [AC_MSG_FAILURE( [Missing function: wcslen], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wcsncasecmp" != xyes && test "x$ac_cv_func_wcscasecmp" != xyes && test "x$ac_cv_func_wcsnicmp" != xyes && test "x$ac_cv_func_towlower" != xyes], [AC_MSG_FAILURE( [Missing functions: wcsncasecmp, wcscasecmp, wcsnicmp and towlower], [1]) - ]) + ]) AS_IF( [test "x$ac_cv_func_wcsstr" != xyes], [AC_MSG_FAILURE( [Missing function: wcsstr], [1]) + ]) ]) - ]) dnl Check for printf conversion specifier support AX_COMMON_CHECK_FUNC_PRINTF_JD AX_COMMON_CHECK_FUNC_PRINTF_ZD -]) + ]) + +dnl Function to test if a library with a specific definition is available +AC_DEFUN([AX_CHECK_LIB_DEFINITION], + [AC_CACHE_CHECK( + [if `$2' is defined], + [ac_cv_$1_definition_$2], + [AC_LANG_PUSH(C) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <$1.h>]], + [[int test = $2; + +return( 0 ); ]] + )], + [ac_cv_$1_definition_$2=yes], + [ac_cv_$1_definition_$2=no]) + AC_LANG_POP(C)]) + + AS_IF( + [test "x$ac_cv_$1_definition_$2" != xyes], + [ac_cv_$1=no]) + ]) + +dnl Function to test if a library with specific definitions is available +AC_DEFUN([AX_CHECK_LIB_DEFINITIONS], + [m4_foreach( + [definition], + [$2], + [AX_CHECK_LIB_DEFINITION( + [$1], + [definition]) + ]) + ]) + +dnl Function to test if a library with specific functions is available +AC_DEFUN([AX_CHECK_LIB_FUNCTIONS], + [ac_cv_$1=yes + + m4_foreach( + [function], + [$3], + [AC_CHECK_LIB( + [$2], + [function], + [ac_cv_$1_dummy=yes], + [ac_cv_$1=no]) + ]) + ]) + +dnl Function to check if an user specified library directory exists +AC_DEFUN([AX_CHECK_LIB_DIRECTORY_EXISTS], + [AS_IF( + [test -d "$ac_cv_with_$1"], + [CFLAGS="$CFLAGS -I${ac_cv_with_$1}/include" + LDFLAGS="$LDFLAGS -L${ac_cv_with_$1}/lib"], + [AC_MSG_FAILURE( + [no such directory: $ac_cv_with_$1], + [1]) + ]) + ]) + +dnl Function to warn if no supported library was found in an user specified directory +AC_DEFUN([AX_CHECK_LIB_DIRECTORY_MSG_ON_FAILURE], + [AS_IF( + [test "x$ac_cv_$1" != xyes && test "x$ac_cv_with_$1" != x && test "x$ac_cv_with_$1" != xauto-detect && test "x$ac_cv_with_$1" != xyes], + [AC_MSG_FAILURE( + [unable to find supported $1 in directory: $ac_cv_with_$1], + [1]) + ]) + ]) diff --git a/m4/libcerror.m4 b/m4/libcerror.m4 index e9abcdb..44ce6f3 100644 --- a/m4/libcerror.m4 +++ b/m4/libcerror.m4 @@ -1,6 +1,6 @@ dnl Checks for libcerror required headers and functions dnl -dnl Version: 20240413 +dnl Version: 20240511 dnl Function to detect if libcerror is available dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -14,15 +14,7 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB], dnl treat them as auto-detection. AS_IF( [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes], - [AS_IF( - [test -d "$ac_cv_with_libcerror"], - [CFLAGS="$CFLAGS -I${ac_cv_with_libcerror}/include" - LDFLAGS="$LDFLAGS -L${ac_cv_with_libcerror}/lib"], - [AC_MSG_FAILURE( - [no such directory: $ac_cv_with_libcerror], - [1]) - ]) - ], + [AX_CHECK_LIB_DIRECTORY_EXISTS([libcerror])], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], @@ -46,68 +38,23 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB], AS_IF( [test "x$ac_cv_header_libcerror_h" = xno], [ac_cv_libcerror=no], - [dnl Check for the individual functions - ac_cv_libcerror=yes - - AC_CHECK_LIB( - cerror, - libcerror_get_version, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - - dnl Error functions - AC_CHECK_LIB( - cerror, - libcerror_error_free, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - AC_CHECK_LIB( - cerror, - libcerror_error_set, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - AC_CHECK_LIB( - cerror, - libcerror_error_matches, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - AC_CHECK_LIB( - cerror, - libcerror_error_fprint, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - AC_CHECK_LIB( - cerror, - libcerror_error_sprint, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - AC_CHECK_LIB( - cerror, - libcerror_error_backtrace_fprint, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - AC_CHECK_LIB( - cerror, - libcerror_error_backtrace_sprint, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) - - dnl System error functions - AC_CHECK_LIB( - cerror, - libcerror_system_set_error, - [ac_cv_libcerror_dummy=yes], - [ac_cv_libcerror=no]) + [AX_CHECK_LIB_FUNCTIONS( + [libcerror], + [cerror], + [[libcerror_get_version], + [libcerror_error_free], + [libcerror_error_set], + [libcerror_error_matches], + [libcerror_error_fprint], + [libcerror_error_sprint], + [libcerror_error_backtrace_fprint], + [libcerror_error_backtrace_sprint], + [libcerror_system_set_error]]) ac_cv_libcerror_LIBADD="-lcerror"]) ]) - AS_IF( - [test "x$ac_cv_libcerror" != xyes && test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes], - [AC_MSG_FAILURE( - [unable to find supported libcerror in directory: $ac_cv_with_libcerror], - [1]) - ]) + AX_CHECK_LIB_DIRECTORY_MSG_ON_FAILURE([libcerror]) ]) AS_IF( diff --git a/m4/libclocale.m4 b/m4/libclocale.m4 index bd5a10e..93e4a01 100644 --- a/m4/libclocale.m4 +++ b/m4/libclocale.m4 @@ -1,6 +1,6 @@ dnl Checks for libclocale required headers and functions dnl -dnl Version: 20240413 +dnl Version: 20240512 dnl Function to detect if libclocale is available dnl ac_libclocale_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -14,15 +14,7 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB], dnl treat them as auto-detection. AS_IF( [test "x$ac_cv_with_libclocale" != x && test "x$ac_cv_with_libclocale" != xauto-detect && test "x$ac_cv_with_libclocale" != xyes], - [AS_IF( - [test -d "$ac_cv_with_libclocale"], - [CFLAGS="$CFLAGS -I${ac_cv_with_libclocale}/include" - LDFLAGS="$LDFLAGS -L${ac_cv_with_libclocale}/lib"], - [AC_MSG_FAILURE( - [no such directory: $ac_cv_with_libclocale], - [1]) - ]) - ], + [AX_CHECK_LIB_DIRECTORY_EXISTS([libclocale])], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], @@ -67,36 +59,17 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB], AS_IF( [test "x$ac_cv_header_libclocale_h" = xno], [ac_cv_libclocale=no], - [dnl Check for the individual functions - ac_cv_libclocale=yes - - AC_CHECK_LIB( - clocale, - libclocale_get_version, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - - dnl Codepage functions - AC_CHECK_LIB( - clocale, - libclocale_codepage, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - AC_CHECK_LIB( - clocale, - libclocale_codepage_get, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - AC_CHECK_LIB( - clocale, - libclocale_codepage_set, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - AC_CHECK_LIB( - clocale, - libclocale_codepage_copy_from_string, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) + [AX_CHECK_LIB_FUNCTIONS( + [libclocale], + [clocale], + [[libclocale_get_version], + [libclocale_codepage], + [libclocale_codepage_get], + [libclocale_codepage_set], + [libclocale_codepage_copy_from_string], + [libclocale_locale_get_codepage], + [libclocale_locale_get_decimal_point], + [libclocale_initialize]]) AS_IF( [test "x$ac_cv_enable_wide_character_type" != xno], @@ -107,34 +80,10 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB], [ac_cv_libclocale=no]) ]) - dnl Locale functions - AC_CHECK_LIB( - clocale, - libclocale_locale_get_codepage, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - AC_CHECK_LIB( - clocale, - libclocale_locale_get_decimal_point, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - - dnl Support functions - AC_CHECK_LIB( - clocale, - libclocale_initialize, - [ac_cv_libclocale_dummy=yes], - [ac_cv_libclocale=no]) - ac_cv_libclocale_LIBADD="-lclocale"]) ]) - AS_IF( - [test "x$ac_cv_libclocale" != xyes && test "x$ac_cv_with_libclocale" != x && test "x$ac_cv_with_libclocale" != xauto-detect && test "x$ac_cv_with_libclocale" != xyes], - [AC_MSG_FAILURE( - [unable to find supported libclocale in directory: $ac_cv_with_libclocale], - [1]) - ]) + AX_CHECK_LIB_DIRECTORY_MSG_ON_FAILURE([libclocale]) ]) AS_IF( diff --git a/m4/libuna.m4 b/m4/libuna.m4 index 996ac60..052142b 100644 --- a/m4/libuna.m4 +++ b/m4/libuna.m4 @@ -1,23 +1,6 @@ dnl Checks for libuna or required headers and functions dnl -dnl Version: 20240413 - -dnl Function to detect if a specific libuna definition is available. -AC_DEFUN([AX_LIBUNA_CHECK_DEFINITION], - [AC_CACHE_CHECK( - [if `$1' is defined], - [$2], - [AC_LANG_PUSH(C) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[int test = $1; - -return( 0 ); ]] )], - [$2=yes], - [$2=no]) - AC_LANG_POP(C)]) - ]) +dnl Version: 20240512 dnl Function to detect if libuna is available dnl ac_libuna_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -31,15 +14,7 @@ AC_DEFUN([AX_LIBUNA_CHECK_LIB], dnl treat them as auto-detection. AS_IF( [test "x$ac_cv_with_libuna" != x && test "x$ac_cv_with_libuna" != xauto-detect && test "x$ac_cv_with_libuna" != xyes], - [AS_IF( - [test -d "$ac_cv_with_libuna"], - [CFLAGS="$CFLAGS -I${ac_cv_with_libuna}/include" - LDFLAGS="$LDFLAGS -L${ac_cv_with_libuna}/lib"], - [AC_MSG_FAILURE( - [no such directory: $ac_cv_with_libuna], - [1]) - ]) - ], + [AX_CHECK_LIB_DIRECTORY_EXISTS([libuna])], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], @@ -63,894 +38,184 @@ AC_DEFUN([AX_LIBUNA_CHECK_LIB], AS_IF( [test "x$ac_cv_header_libuna_h" = xno], [ac_cv_libuna=no], - [dnl Check for the individual functions - ac_cv_libuna=yes - - AC_CHECK_LIB( - una, - libuna_get_version, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl Base16 stream functions - AC_CHECK_LIB( - una, - libuna_base16_stream_size_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base16_stream_copy_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base16_stream_size_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base16_stream_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base16_stream_with_index_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl Base32 stream functions - AC_CHECK_LIB( - una, - libuna_base32_quintuplet_copy_from_base32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_quintuplet_copy_to_base32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_quintuplet_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_quintuplet_copy_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - AC_CHECK_LIB( - una, - libuna_base32_stream_size_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_stream_copy_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_stream_size_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_stream_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base32_stream_with_index_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl Base64 stream functions - AC_CHECK_LIB( - una, - libuna_base64_triplet_copy_from_base64_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_triplet_copy_to_base64_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_triplet_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_triplet_copy_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - AC_CHECK_LIB( - una, - libuna_base64_stream_size_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_stream_copy_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_stream_size_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_stream_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_base64_stream_with_index_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl Byte stream functions - AC_CHECK_LIB( - una, - libuna_byte_stream_size_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_byte_stream_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_byte_stream_size_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_byte_stream_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_byte_stream_size_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_byte_stream_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl Unicode character functions - AC_CHECK_LIB( - una, - libuna_unicode_character_size_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_size_to_ucs2, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_ucs2, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_ucs2, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_size_to_ucs4, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_ucs4, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_ucs4, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_size_to_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_size_to_utf8_rfc2279, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf8_rfc2279, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf8_rfc2279, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_size_to_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_unicode_character_copy_to_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl UTF-8 stream functions - AC_CHECK_LIB( - una, - libuna_utf8_stream_size_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_stream_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_stream_size_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_stream_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_stream_size_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_stream_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl UTF-16 stream functions - AC_CHECK_LIB( - una, - libuna_utf16_stream_size_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_stream_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_stream_size_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_stream_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_stream_size_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_stream_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl UTF-32 stream functions - AC_CHECK_LIB( - una, - libuna_utf32_stream_size_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_stream_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_stream_size_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_stream_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_stream_size_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_stream_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl UTF-8 string functions - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_compare_with_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_size_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_copy_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf8_string_with_index_copy_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl UTF-16 string functions - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_compare_with_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_compare_with_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - dnl libuna_utf16_string_compare_with_utf8 is implemented by libuna_utf8_string_compare_with_utf16 - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_compare_with_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_compare_with_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_compare_with_utf32, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_compare_with_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_size_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_copy_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf16_string_with_index_copy_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl UTF-32 string functions - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_compare_with_byte_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_compare_with_utf7_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - libuna_utf32_string_with_index_copy_from_utf8, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - dnl libuna_utf32_string_compare_with_utf8 is implemented by libuna_utf8_string_compare_with_utf32 - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_compare_with_utf8_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_utf16, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - dnl libuna_utf32_string_compare_with_utf16 is implemented by libuna_utf16_string_compare_with_utf32 - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_compare_with_utf16_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_compare_with_utf32_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_size_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_copy_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - AC_CHECK_LIB( - una, - libuna_utf32_string_with_index_copy_from_scsu_stream, - [ac_cv_libuna_dummy=yes], - [ac_cv_libuna=no]) - - dnl Check for definitions - AX_LIBUNA_CHECK_DEFINITION( - LIBUNA_COMPARE_LESS, - [ac_cv_libuna_defines_compare_less]) - AS_IF( - [test "x$ac_cv_libuna_defines_compare_less" != xyes], - [ac_cv_libuna=no]) - - AX_LIBUNA_CHECK_DEFINITION( - LIBUNA_COMPARE_EQUAL, - [ac_cv_libuna_defines_compare_equal]) - AS_IF( - [test "x$ac_cv_libuna_defines_compare_less" != xyes], - [ac_cv_libuna=no]) - - AX_LIBUNA_CHECK_DEFINITION( - LIBUNA_COMPARE_GREATER, - [ac_cv_libuna_defines_compare_greater]) - AS_IF( - [test "x$ac_cv_libuna_defines_compare_less" != xyes], - [ac_cv_libuna=no]) - - AX_LIBUNA_CHECK_DEFINITION( - LIBUNA_UTF16_STREAM_ALLOW_UNPAIRED_SURROGATE, - [ac_cv_libuna_defines_compare_greater]) - AS_IF( - [test "x$ac_cv_libuna_defines_utf16_stream_allow_unpaired_surrogate" != xyes], - [ac_cv_libuna=no]) + [AX_CHECK_LIB_FUNCTIONS( + [libuna], + [una], + [[libuna_get_version], + [libuna_base16_stream_size_to_byte_stream], + [libuna_base16_stream_copy_to_byte_stream], + [libuna_base16_stream_size_from_byte_stream], + [libuna_base16_stream_copy_from_byte_stream], + [libuna_base16_stream_with_index_copy_from_byte_stream], + [libuna_base32_quintuplet_copy_from_base32_stream], + [libuna_base32_quintuplet_copy_to_base32_stream], + [libuna_base32_quintuplet_copy_from_byte_stream], + [libuna_base32_quintuplet_copy_to_byte_stream], + [libuna_base32_stream_size_to_byte_stream], + [libuna_base32_stream_copy_to_byte_stream], + [libuna_base32_stream_size_from_byte_stream], + [libuna_base32_stream_copy_from_byte_stream], + [libuna_base32_stream_with_index_copy_from_byte_stream], + [libuna_base64_triplet_copy_from_base64_stream], + [libuna_base64_triplet_copy_to_base64_stream], + [libuna_base64_triplet_copy_from_byte_stream], + [libuna_base64_triplet_copy_to_byte_stream], + [libuna_base64_stream_size_to_byte_stream], + [libuna_base64_stream_copy_to_byte_stream], + [libuna_base64_stream_size_from_byte_stream], + [libuna_base64_stream_copy_from_byte_stream], + [libuna_base64_stream_with_index_copy_from_byte_stream], + [libuna_byte_stream_size_from_utf8], + [libuna_byte_stream_copy_from_utf8], + [libuna_byte_stream_size_from_utf16], + [libuna_byte_stream_copy_from_utf16], + [libuna_byte_stream_size_from_utf32], + [libuna_byte_stream_copy_from_utf32], + [libuna_unicode_character_size_to_byte_stream], + [libuna_unicode_character_copy_from_byte_stream], + [libuna_unicode_character_copy_to_byte_stream], + [libuna_unicode_character_size_to_ucs2], + [libuna_unicode_character_copy_from_ucs2], + [libuna_unicode_character_copy_to_ucs2], + [libuna_unicode_character_size_to_ucs4], + [libuna_unicode_character_copy_from_ucs4], + [libuna_unicode_character_copy_to_ucs4], + [libuna_unicode_character_copy_from_utf7_stream], + [libuna_unicode_character_copy_to_utf7_stream], + [libuna_unicode_character_size_to_utf8], + [libuna_unicode_character_copy_from_utf8], + [libuna_unicode_character_copy_to_utf8], + [libuna_unicode_character_size_to_utf8_rfc2279], + [libuna_unicode_character_copy_from_utf8_rfc2279], + [libuna_unicode_character_copy_to_utf8_rfc2279], + [libuna_unicode_character_size_to_utf16], + [libuna_unicode_character_copy_from_utf16], + [libuna_unicode_character_copy_to_utf16], + [libuna_unicode_character_copy_from_utf16_stream], + [libuna_unicode_character_copy_to_utf16_stream], + [libuna_unicode_character_copy_from_utf32], + [libuna_unicode_character_copy_to_utf32], + [libuna_unicode_character_copy_from_utf32_stream], + [libuna_unicode_character_copy_to_utf32_stream], + [libuna_utf8_stream_size_from_utf8], + [libuna_utf8_stream_copy_from_utf8], + [libuna_utf8_stream_size_from_utf16], + [libuna_utf8_stream_copy_from_utf16], + [libuna_utf8_stream_size_from_utf32], + [libuna_utf8_stream_copy_from_utf32], + [libuna_utf16_stream_size_from_utf8], + [libuna_utf16_stream_copy_from_utf8], + [libuna_utf16_stream_size_from_utf16], + [libuna_utf16_stream_copy_from_utf16], + [libuna_utf16_stream_size_from_utf32], + [libuna_utf16_stream_copy_from_utf32], + [libuna_utf32_stream_size_from_utf8], + [libuna_utf32_stream_copy_from_utf8], + [libuna_utf32_stream_size_from_utf16], + [libuna_utf32_stream_copy_from_utf16], + [libuna_utf32_stream_size_from_utf32], + [libuna_utf32_stream_copy_from_utf32], + [libuna_utf8_string_size_from_byte_stream], + [libuna_utf8_string_copy_from_byte_stream], + [libuna_utf8_string_with_index_copy_from_byte_stream], + [libuna_utf8_string_compare_with_byte_stream], + [libuna_utf8_string_size_from_utf7_stream], + [libuna_utf8_string_copy_from_utf7_stream], + [libuna_utf8_string_with_index_copy_from_utf7_stream], + [libuna_utf8_string_compare_with_utf7_stream], + [libuna_utf8_string_size_from_utf8_stream], + [libuna_utf8_string_copy_from_utf8_stream], + [libuna_utf8_string_with_index_copy_from_utf8_stream], + [libuna_utf8_string_compare_with_utf8_stream], + [libuna_utf8_string_size_from_utf16], + [libuna_utf8_string_copy_from_utf16], + [libuna_utf8_string_with_index_copy_from_utf16], + [libuna_utf8_string_compare_with_utf16], + [libuna_utf8_string_size_from_utf16_stream], + [libuna_utf8_string_copy_from_utf16_stream], + [libuna_utf8_string_with_index_copy_from_utf16_stream], + [libuna_utf8_string_compare_with_utf16_stream], + [libuna_utf8_string_size_from_utf32], + [libuna_utf8_string_copy_from_utf32], + [libuna_utf8_string_with_index_copy_from_utf32], + [libuna_utf8_string_compare_with_utf32], + [libuna_utf8_string_size_from_utf32_stream], + [libuna_utf8_string_copy_from_utf32_stream], + [libuna_utf8_string_with_index_copy_from_utf32_stream], + [libuna_utf8_string_compare_with_utf32_stream], + [libuna_utf8_string_size_from_scsu_stream], + [libuna_utf8_string_copy_from_scsu_stream], + [libuna_utf8_string_with_index_copy_from_scsu_stream], + [libuna_utf16_string_size_from_byte_stream], + [libuna_utf16_string_copy_from_byte_stream], + [libuna_utf16_string_with_index_copy_from_byte_stream], + [libuna_utf16_string_compare_with_byte_stream], + [libuna_utf16_string_size_from_utf7_stream], + [libuna_utf16_string_copy_from_utf7_stream], + [libuna_utf16_string_with_index_copy_from_utf7_stream], + [libuna_utf16_string_compare_with_utf7_stream], + [libuna_utf16_string_size_from_utf8], + [libuna_utf16_string_copy_from_utf8], + [libuna_utf16_string_with_index_copy_from_utf8], + [libuna_utf16_string_size_from_utf8_stream], + [libuna_utf16_string_copy_from_utf8_stream], + [libuna_utf16_string_with_index_copy_from_utf8_stream], + [libuna_utf16_string_compare_with_utf8_stream], + [libuna_utf16_string_size_from_utf16_stream], + [libuna_utf16_string_copy_from_utf16_stream], + [libuna_utf16_string_with_index_copy_from_utf16_stream], + [libuna_utf16_string_compare_with_utf16_stream], + [libuna_utf16_string_size_from_utf32], + [libuna_utf16_string_copy_from_utf32], + [libuna_utf16_string_with_index_copy_from_utf32], + [libuna_utf16_string_compare_with_utf32], + [libuna_utf16_string_size_from_utf32_stream], + [libuna_utf16_string_copy_from_utf32_stream], + [libuna_utf16_string_with_index_copy_from_utf32_stream], + [libuna_utf16_string_compare_with_utf32_stream], + [libuna_utf16_string_size_from_scsu_stream], + [libuna_utf16_string_copy_from_scsu_stream], + [libuna_utf16_string_with_index_copy_from_scsu_stream], + [libuna_utf32_string_size_from_byte_stream], + [libuna_utf32_string_copy_from_byte_stream], + [libuna_utf32_string_with_index_copy_from_byte_stream], + [libuna_utf32_string_compare_with_byte_stream], + [libuna_utf32_string_size_from_utf7_stream], + [libuna_utf32_string_copy_from_utf7_stream], + [libuna_utf32_string_with_index_copy_from_utf7_stream], + [libuna_utf32_string_compare_with_utf7_stream], + [libuna_utf32_string_size_from_utf8_stream], + [libuna_utf32_string_size_from_utf8], + [libuna_utf32_string_copy_from_utf8], + [libuna_utf32_string_copy_from_utf8_stream], + [libuna_utf32_string_with_index_copy_from_utf8_stream], + [libuna_utf32_string_compare_with_utf8_stream], + [libuna_utf32_string_size_from_utf16], + [libuna_utf32_string_copy_from_utf16], + [libuna_utf32_string_with_index_copy_from_utf16], + [libuna_utf32_string_size_from_utf16_stream], + [libuna_utf32_string_copy_from_utf16_stream], + [libuna_utf32_string_with_index_copy_from_utf16_stream], + [libuna_utf32_string_compare_with_utf16_stream], + [libuna_utf32_string_size_from_utf32_stream], + [libuna_utf32_string_copy_from_utf32_stream], + [libuna_utf32_string_with_index_copy_from_utf32_stream], + [libuna_utf32_string_compare_with_utf32_stream], + [libuna_utf32_string_size_from_scsu_stream], + [libuna_utf32_string_copy_from_scsu_stream], + [libuna_utf32_string_with_index_copy_from_scsu_stream]]) + + AX_CHECK_LIB_DEFINITIONS( + [libuna], + [[LIBUNA_COMPARE_LESS], + [LIBUNA_COMPARE_EQUAL], + [LIBUNA_COMPARE_GREATER], + [LIBUNA_UTF16_STREAM_ALLOW_UNPAIRED_SURROGATE]]) ac_cv_libuna_LIBADD="-luna"]) ]) - AS_IF( - [test "x$ac_cv_libuna" != xyes && test "x$ac_cv_with_libuna" != x && test "x$ac_cv_with_libuna" != xauto-detect && test "x$ac_cv_with_libuna" != xyes], - [AC_MSG_FAILURE( - [unable to find supported libuna in directory: $ac_cv_with_libuna], - [1]) - ]) + AX_CHECK_LIB_DIRECTORY_MSG_ON_FAILURE([libuna]) ]) AS_IF( diff --git a/msvscpp/libcdirectory.sln b/msvscpp/libcdirectory.sln index 47c3b97..4f0b91c 100644 --- a/msvscpp/libcdirectory.sln +++ b/msvscpp/libcdirectory.sln @@ -1,6 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclocale", "libclocale\libclocale.vcproj", "{D912B2AE-867E-4908-BF1C-4313D32C3FCC}" + ProjectSection(ProjectDependencies) = postProject + {9603DA60-ECBF-4438-B500-CFC15A151F50} = {9603DA60-ECBF-4438-B500-CFC15A151F50} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdirectory_test_directory", "cdirectory_test_directory\cdirectory_test_directory.vcproj", "{FABFBD0A-21A8-4835-9716-9B3C287FCCE0}" ProjectSection(ProjectDependencies) = postProject {EF346A77-7F30-401B-B57B-E4EAEEDFFAF4} = {EF346A77-7F30-401B-B57B-E4EAEEDFFAF4} @@ -30,11 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdirectory_test_system_stri {9603DA60-ECBF-4438-B500-CFC15A151F50} = {9603DA60-ECBF-4438-B500-CFC15A151F50} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclocale", "libclocale\libclocale.vcproj", "{D912B2AE-867E-4908-BF1C-4313D32C3FCC}" - ProjectSection(ProjectDependencies) = postProject - {9603DA60-ECBF-4438-B500-CFC15A151F50} = {9603DA60-ECBF-4438-B500-CFC15A151F50} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libuna", "libuna\libuna.vcproj", "{A3E34A21-6A3C-4B6D-BDF2-5EA55ED415B8}" ProjectSection(ProjectDependencies) = postProject {9603DA60-ECBF-4438-B500-CFC15A151F50} = {9603DA60-ECBF-4438-B500-CFC15A151F50} @@ -55,6 +55,10 @@ Global VSDebug|Win32 = VSDebug|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.Release|Win32.ActiveCfg = Release|Win32 + {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.Release|Win32.Build.0 = Release|Win32 + {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.VSDebug|Win32.ActiveCfg = VSDebug|Win32 + {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.VSDebug|Win32.Build.0 = VSDebug|Win32 {FABFBD0A-21A8-4835-9716-9B3C287FCCE0}.Release|Win32.ActiveCfg = Release|Win32 {FABFBD0A-21A8-4835-9716-9B3C287FCCE0}.Release|Win32.Build.0 = Release|Win32 {FABFBD0A-21A8-4835-9716-9B3C287FCCE0}.VSDebug|Win32.ActiveCfg = VSDebug|Win32 @@ -75,10 +79,6 @@ Global {2994B871-E2D3-4FA5-A507-E55402855FE5}.Release|Win32.Build.0 = Release|Win32 {2994B871-E2D3-4FA5-A507-E55402855FE5}.VSDebug|Win32.ActiveCfg = VSDebug|Win32 {2994B871-E2D3-4FA5-A507-E55402855FE5}.VSDebug|Win32.Build.0 = VSDebug|Win32 - {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.Release|Win32.ActiveCfg = Release|Win32 - {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.Release|Win32.Build.0 = Release|Win32 - {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.VSDebug|Win32.ActiveCfg = VSDebug|Win32 - {D912B2AE-867E-4908-BF1C-4313D32C3FCC}.VSDebug|Win32.Build.0 = VSDebug|Win32 {A3E34A21-6A3C-4B6D-BDF2-5EA55ED415B8}.Release|Win32.ActiveCfg = Release|Win32 {A3E34A21-6A3C-4B6D-BDF2-5EA55ED415B8}.Release|Win32.Build.0 = Release|Win32 {A3E34A21-6A3C-4B6D-BDF2-5EA55ED415B8}.VSDebug|Win32.ActiveCfg = VSDebug|Win32 diff --git a/msvscpp/libuna/libuna.vcproj b/msvscpp/libuna/libuna.vcproj index 79efe92..a87a323 100644 --- a/msvscpp/libuna/libuna.vcproj +++ b/msvscpp/libuna/libuna.vcproj @@ -226,6 +226,78 @@ RelativePath="..\..\libuna\libuna_codepage_koi8_u.c" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -412,6 +484,78 @@ RelativePath="..\..\libuna\libuna_codepage_koi8_u.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +