Skip to content

Commit 1d9636b

Browse files
joachimmetzjoachimmetz
committed
Applied updates
1 parent 88a494d commit 1d9636b

File tree

12 files changed

+254
-215
lines changed

12 files changed

+254
-215
lines changed

‎autogen.ps1‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Script to generate the necessary files for a msvscpp build
22
#
3-
# Version: 20230118
3+
# Version: 20240306
44

55
$WinFlex = "..\win_flex_bison\win_flex.exe"
66
$WinBison = "..\win_flex_bison\win_bison.exe"
@@ -29,33 +29,36 @@ If (Test-Path "${Prefix}.net")
2929

3030
$NamePrefix = ""
3131

32-
ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.l")
32+
ForEach (${Library} in Get-ChildItem -Directory -Path "lib*")
3333
{
34-
$OutputFile = ${DirectoryElement} -Replace ".l$",".c"
34+
ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.l")
35+
{
36+
$OutputFile = ${DirectoryElement} -Replace ".l$",".c"
3537

36-
$NamePrefix = Split-Path -path ${DirectoryElement} -leaf
37-
$NamePrefix = ${NamePrefix} -Replace ".l$","_"
38+
$NamePrefix = Split-Path -path ${DirectoryElement} -leaf
39+
$NamePrefix = ${NamePrefix} -Replace ".l$","_"
3840

39-
Write-Host "Running: ${WinFlex} -Cf ${DirectoryElement}"
41+
Write-Host "Running: ${WinFlex} -Cf ${DirectoryElement}"
4042

41-
# PowerShell will raise NativeCommandError if win_flex writes to stdout or stderr
42-
# therefore 2>&1 is added and the output is stored in a variable.
43-
$Output = Invoke-Expression -Command "& '${WinFlex}' -Cf ${DirectoryElement} 2>&1"
44-
Write-Host ${Output}
43+
# PowerShell will raise NativeCommandError if win_flex writes to stdout or stderr
44+
# therefore 2>&1 is added and the output is stored in a variable.
45+
$Output = Invoke-Expression -Command "& '${WinFlex}' -Cf ${DirectoryElement} 2>&1"
46+
Write-Host ${Output}
4547

46-
# Moving manually since `win_flex -o filename' does not provide the expected behavior.
47-
Move-Item "lex.yy.c" ${OutputFile} -force
48-
}
48+
# Moving manually since `win_flex -o filename' does not provide the expected behavior.
49+
Move-Item "lex.yy.c" ${OutputFile} -force
50+
}
4951

50-
ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.y")
51-
{
52-
$OutputFile = ${DirectoryElement} -Replace ".y$",".c"
52+
ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.y")
53+
{
54+
$OutputFile = ${DirectoryElement} -Replace ".y$",".c"
5355

54-
Write-Host "Running: ${WinBison} -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement}"
56+
Write-Host "Running: ${WinBison} -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement}"
5557

56-
# PowerShell will raise NativeCommandError if win_bison writes to stdout or stderr
57-
# therefore 2>&1 is added and the output is stored in a variable.
58-
$Output = Invoke-Expression -Command "& '${WinBison}' -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement} 2>&1"
59-
Write-Host ${Output}
58+
# PowerShell will raise NativeCommandError if win_bison writes to stdout or stderr
59+
# therefore 2>&1 is added and the output is stored in a variable.
60+
$Output = Invoke-Expression -Command "& '${WinBison}' -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement} 2>&1"
61+
Write-Host ${Output}
62+
}
6063
}
6164

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
22

33
AC_INIT(
44
[libfvalue],
5-
[20240124],
5+
[20240410],
66
[[email protected]])
77

88
AC_CONFIG_SRCDIR(

‎m4/common.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for common headers and functions
22
dnl
3-
dnl Version: 20181117
3+
dnl Version: 20240308
44

55
dnl Function to test if a certain feature was disabled
66
AC_DEFUN([AX_COMMON_ARG_DISABLE],
@@ -26,7 +26,7 @@ AC_DEFUN([AX_COMMON_ARG_ENABLE],
2626
[$1],
2727
[AS_HELP_STRING(
2828
[--enable-$1],
29-
[$3 [default=$4]])],
29+
[$3 @<:@default=$4@:>@])],
3030
[ac_cv_enable_$2=$enableval],
3131
[ac_cv_enable_$2=$4])dnl
3232
@@ -43,7 +43,7 @@ AC_DEFUN([AX_COMMON_ARG_WITH],
4343
[$1],
4444
[AS_HELP_STRING(
4545
[--with-$1[[=$5]]],
46-
[$3 [default=$4]])],
46+
[$3 @<:@default=$4@:>@])],
4747
[ac_cv_with_$2=$withval],
4848
[ac_cv_with_$2=$4])dnl
4949

‎m4/libcdata.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libcdata required headers and functions
22
dnl
3-
dnl Version: 20230108
3+
dnl Version: 20240314
44

55
dnl Function to detect if libcdata is available
66
dnl ac_libcdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBCDATA_CHECK_LIB],
1010
[ac_cv_libcdata=no],
1111
[ac_cv_libcdata=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libcdata which returns "yes" and --with-libcdata= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libcdata" != x && test "x$ac_cv_with_libcdata" != xauto-detect],
16+
[test "x$ac_cv_with_libcdata" != x && test "x$ac_cv_with_libcdata" != xauto-detect && test "x$ac_cv_with_libcdata" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libcdata"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libcdata}/include"
@@ -497,8 +499,9 @@ AC_DEFUN([AX_LIBCDATA_CHECK_LIB],
497499
498500
ac_cv_libcdata_LIBADD="-lcdata"])
499501
])
502+
500503
AS_IF(
501-
[test "x$ac_cv_with_libcdata" != x && test "x$ac_cv_with_libcdata" != xauto-detect && test "x$ac_cv_libcdata" != xyes],
504+
[test "x$ac_cv_libcdata" != xyes && test "x$ac_cv_with_libcdata" != x && test "x$ac_cv_with_libcdata" != xauto-detect && test "x$ac_cv_with_libcdata" != xyes],
502505
[AC_MSG_FAILURE(
503506
[unable to find supported libcdata in directory: $ac_cv_with_libcdata],
504507
[1])

‎m4/libcerror.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libcerror required headers and functions
22
dnl
3-
dnl Version: 20190308
3+
dnl Version: 20240314
44

55
dnl Function to detect if libcerror is available
66
dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB],
1010
[ac_cv_libcerror=no],
1111
[ac_cv_libcerror=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libcerror which returns "yes" and --with-libcerror= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect],
16+
[test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libcerror"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libcerror}/include"
@@ -99,8 +101,9 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB],
99101
100102
ac_cv_libcerror_LIBADD="-lcerror"])
101103
])
104+
102105
AS_IF(
103-
[test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_libcerror" != xyes],
106+
[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],
104107
[AC_MSG_FAILURE(
105108
[unable to find supported libcerror in directory: $ac_cv_with_libcerror],
106109
[1])

‎m4/libcnotify.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libcnotify required headers and functions
22
dnl
3-
dnl Version: 20190308
3+
dnl Version: 20240314
44

55
dnl Function to detect if libcnotify is available
66
dnl ac_libcnotify_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBCNOTIFY_CHECK_LIB],
1010
[ac_cv_libcnotify=no],
1111
[ac_cv_libcnotify=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libcnotify which returns "yes" and --with-libcnotify= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect],
16+
[test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect && test "x$ac_cv_with_libcnotify" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libcnotify"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libcnotify}/include"
@@ -96,8 +98,9 @@ AC_DEFUN([AX_LIBCNOTIFY_CHECK_LIB],
9698
9799
ac_cv_libcnotify_LIBADD="-lcnotify"])
98100
])
101+
99102
AS_IF(
100-
[test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect && test "x$ac_cv_libcnotify" != xyes],
103+
[test "x$ac_with_libcnotify" != xyes && test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect && test "x$ac_cv_with_libcnotify" != xyes],
101104
[AC_MSG_FAILURE(
102105
[unable to find supported libcnotify in directory: $ac_cv_with_libcnotify],
103106
[1])

‎m4/libcthreads.m4‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libcthreads required headers and functions
22
dnl
3-
dnl Version: 20190308
3+
dnl Version: 20240314
44

55
dnl Function to detect if libcthreads is available
66
dnl ac_libcthreads_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBCTHREADS_CHECK_LIB],
1010
[ac_cv_libcthreads=no],
1111
[ac_cv_libcthreads=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libcthreads which returns "yes" and --with-libcthreads= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect],
16+
[test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect && test "x$ac_cv_with_libcthreads" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libcthreads"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libcthreads}/include"
@@ -248,7 +250,7 @@ AC_DEFUN([AX_LIBCTHREADS_CHECK_LIB],
248250
])
249251
250252
AS_IF(
251-
[test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect && test "x$ac_cv_libcthreads" != xyes],
253+
[test "x$ac_cv_libcthreads" != xyes && test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect && test "x$ac_cv_with_libcthreads" != xyes],
252254
[AC_MSG_FAILURE(
253255
[unable to find supported libcthreads in directory: $ac_cv_with_libcthreads],
254256
[1])

‎m4/libfdatetime.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libfdatetime required headers and functions
22
dnl
3-
dnl Version: 20190308
3+
dnl Version: 20240314
44

55
dnl Function to detect if libfdatetime is available
66
dnl ac_libfdatetime_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBFDATETIME_CHECK_LIB],
1010
[ac_cv_libfdatetime=no],
1111
[ac_cv_libfdatetime=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libfdatetime which returns "yes" and --with-libfdatetime= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libfdatetime" != x && test "x$ac_cv_with_libfdatetime" != xauto-detect],
16+
[test "x$ac_cv_with_libfdatetime" != x && test "x$ac_cv_with_libfdatetime" != xauto-detect && test "x$ac_cv_with_libfdatetime" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libfdatetime"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libfdatetime}/include"
@@ -459,8 +461,9 @@ AC_DEFUN([AX_LIBFDATETIME_CHECK_LIB],
459461
460462
ac_cv_libfdatetime_LIBADD="-lfdatetime"])
461463
])
464+
462465
AS_IF(
463-
[test "x$ac_cv_with_libfdatetime" != x && test "x$ac_cv_with_libfdatetime" != xauto-detect && test "x$ac_cv_libfdatetime" != xyes],
466+
[test "x$ac_cv_libfdatetime" != xyes && test "x$ac_cv_with_libfdatetime" != x && test "x$ac_cv_with_libfdatetime" != xauto-detect && test "x$ac_cv_with_libfdatetime" != xyes],
464467
[AC_MSG_FAILURE(
465468
[unable to find supported libfdatetime in directory: $ac_cv_with_libfdatetime],
466469
[1])

‎m4/libfguid.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libfguid required headers and functions
22
dnl
3-
dnl Version: 20190308
3+
dnl Version: 20240314
44

55
dnl Function to detect if libfguid is available
66
dnl ac_libfguid_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBFGUID_CHECK_LIB],
1010
[ac_cv_libfguid=no],
1111
[ac_cv_libfguid=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libfguid which returns "yes" and --with-libfguid= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libfguid" != x && test "x$ac_cv_with_libfguid" != xauto-detect],
16+
[test "x$ac_cv_with_libfguid" != x && test "x$ac_cv_with_libfguid" != xauto-detect && test "x$ac_cv_with_libfguid" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libfguid"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libfguid}/include"
@@ -107,8 +109,9 @@ AC_DEFUN([AX_LIBFGUID_CHECK_LIB],
107109
108110
ac_cv_libfguid_LIBADD="-lfguid"])
109111
])
112+
110113
AS_IF(
111-
[test "x$ac_cv_with_libfguid" != x && test "x$ac_cv_with_libfguid" != xauto-detect && test "x$ac_cv_libfguid" != xyes],
114+
[test "x$ac_cv_libfguid" != xyes && test "x$ac_cv_with_libfguid" != x && test "x$ac_cv_with_libfguid" != xauto-detect && test "x$ac_cv_with_libfguid" != xyes],
112115
[AC_MSG_FAILURE(
113116
[unable to find supported libfguid in directory: $ac_cv_with_libfguid],
114117
[1])

‎m4/libfwnt.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libfwnt required headers and functions
22
dnl
3-
dnl Version: 20191217
3+
dnl Version: 20240403
44

55
dnl Function to detect if libfwnt is available
66
dnl ac_libfwnt_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -10,8 +10,10 @@ AC_DEFUN([AX_LIBFWNT_CHECK_LIB],
1010
[ac_cv_libfwnt=no],
1111
[ac_cv_libfwnt=check
1212
dnl Check if the directory provided as parameter exists
13+
dnl For both --with-libfwnt which returns "yes" and --with-libfwnt= which returns ""
14+
dnl treat them as auto-detection.
1315
AS_IF(
14-
[test "x$ac_cv_with_libfwnt" != x && test "x$ac_cv_with_libfwnt" != xauto-detect],
16+
[test "x$ac_cv_with_libfwnt" != x && test "x$ac_cv_with_libfwnt" != xauto-detect && test "x$ac_cv_with_libfwnt" != xyes],
1517
[AS_IF(
1618
[test -d "$ac_cv_with_libfwnt"],
1719
[CFLAGS="$CFLAGS -I${ac_cv_with_libfwnt}/include"
@@ -218,8 +220,9 @@ AC_DEFUN([AX_LIBFWNT_CHECK_LIB],
218220
219221
ac_cv_libfwnt_LIBADD="-lfwnt"])
220222
])
223+
221224
AS_IF(
222-
[test "x$ac_cv_with_libfwnt" != x && test "x$ac_cv_with_libfwnt" != xauto-detect && test "x$ac_cv_libfwnt" != xyes],
225+
[test "x$ac_cv_libfwnt" != xyes && test "x$ac_cv_with_libfwnt" != x && test "x$ac_cv_with_libfwnt" != xauto-detect && test "x$ac_cv_with_libfwnt" != xyes],
223226
[AC_MSG_FAILURE(
224227
[unable to find supported libfwnt in directory: $ac_cv_with_libfwnt],
225228
[1])

0 commit comments

Comments
 (0)