Skip to content

configure.ac: Support more basename formats for DC #3273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abraunegg merged 2 commits into from
May 12, 2025
Merged

configure.ac: Support more basename formats for DC #3273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e955ca4
configure.ac: Support more basename formats for DC
the-horo May 12, 2025
b091ee8
Merge branch 'master' into basename-lenient
abraunegg May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,13 +605,13 @@ sqlite_LIBS
sqlite_CFLAGS
curl_LIBS
curl_CFLAGS
PACKAGE_DATE
WERROR_DCFLAG
OUTPUT_DCFLAG
LINKER_DCFLAG
VERSION_DCFLAG
RELEASE_DCFLAGS
DEBUG_DCFLAGS
PACKAGE_DATE
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
Expand Down Expand Up @@ -2014,6 +2014,9 @@ $as_echo "no" >&6; }
fi
fi

PACKAGE_DATE="April 2025"


for ac_prog in dmd ldmd2 ldc2 gdmd gdc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
Expand Down Expand Up @@ -2059,9 +2062,9 @@ test -n "$DC" || DC="NOT_FOUND"

DC_TYPE=
case $(basename $DC) in
dmd|ldmd2|gdmd) DC_TYPE=dmd ;;
ldc2) DC_TYPE=ldc ;;
gdc) DC_TYPE=gdc ;;
*ldc2*) DC_TYPE=ldc ;;
*gdc*) DC_TYPE=gdc ;;
*dmd*) DC_TYPE=dmd ;;
NOT_FOUND) as_fn_error 1 "Could not find any compatible D compiler" "$LINENO" 5
esac

Expand Down Expand Up @@ -2132,7 +2135,7 @@ if test "$DO_VERSION_CHECK" = "1"; then :
$as_echo_n "checking version of D compiler... " >&6; }
# check for valid versions
case $(basename $DC) in
ldmd2|ldc2)
*ldmd2*|*ldc2*)
# LDC - the LLVM D compiler (1.12.0): ...
VERSION=`$DC --version`
# remove everything up to first (
Expand All @@ -2142,15 +2145,7 @@ case $(basename $DC) in
# now version should be something like L.M.N
MINVERSION=1.18.0
;;
dmd)
# DMD64 D Compiler v2.085.1\n...
VERSION=`$DC --version | tr '\n' ' '`
VERSION=${VERSION#*Compiler v}
VERSION=${VERSION%% *}
# now version should be something like L.M.N
MINVERSION=2.088.0
;;
gdmd|gdc)
*gdmd*|*gdc*)
# Both gdmd and gdc print the same version information
VERSION=`${DC} --version | head -n1`
# Some examples of output:
Expand All @@ -2165,6 +2160,14 @@ case $(basename $DC) in
VERSION=${VERSION%% *}
MINVERSION=15
;;
*dmd*)
# DMD64 D Compiler v2.085.1\n...
VERSION=`$DC --version | tr '\n' ' '`
VERSION=${VERSION#*Compiler v}
VERSION=${VERSION%% *}
# now version should be something like L.M.N
MINVERSION=2.088.0
;;
esac

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION" >&5
Expand Down Expand Up @@ -2216,9 +2219,6 @@ esac



PACKAGE_DATE="April 2025"



pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl" >&5
Expand Down
26 changes: 13 additions & 13 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ dnl Makefile so that we can adjust command line arguments
AC_CHECK_PROGS([DC], [dmd ldmd2 ldc2 gdmd gdc], NOT_FOUND)
DC_TYPE=
case $(basename $DC) in
dmd|ldmd2|gdmd) DC_TYPE=dmd ;;
ldc2) DC_TYPE=ldc ;;
gdc) DC_TYPE=gdc ;;
*ldc2*) DC_TYPE=ldc ;;
*gdc*) DC_TYPE=gdc ;;
*dmd*) DC_TYPE=dmd ;;
NOT_FOUND) AC_MSG_ERROR(Could not find any compatible D compiler, 1)
esac

Expand Down Expand Up @@ -100,7 +100,7 @@ AS_IF([test "$DO_VERSION_CHECK" = "1"],
AC_MSG_CHECKING([version of D compiler])
# check for valid versions
case $(basename $DC) in
ldmd2|ldc2)
*ldmd2*|*ldc2*)
# LDC - the LLVM D compiler (1.12.0): ...
VERSION=`$DC --version`
# remove everything up to first (
Expand All @@ -110,15 +110,7 @@ case $(basename $DC) in
# now version should be something like L.M.N
MINVERSION=1.18.0
;;
dmd)
# DMD64 D Compiler v2.085.1\n...
VERSION=`$DC --version | tr '\n' ' '`
VERSION=${VERSION#*Compiler v}
VERSION=${VERSION%% *}
# now version should be something like L.M.N
MINVERSION=2.088.0
;;
gdmd|gdc)
*gdmd*|*gdc*)
# Both gdmd and gdc print the same version information
VERSION=`${DC} --version | head -n1`
# Some examples of output:
Expand All @@ -133,6 +125,14 @@ case $(basename $DC) in
VERSION=${VERSION%% *}
MINVERSION=15
;;
*dmd*)
# DMD64 D Compiler v2.085.1\n...
VERSION=`$DC --version | tr '\n' ' '`
VERSION=${VERSION#*Compiler v}
VERSION=${VERSION%% *}
# now version should be something like L.M.N
MINVERSION=2.088.0
;;
esac

AC_MSG_RESULT([$VERSION])
Expand Down
Loading