From: Ondřej Surý Date: Wed, 27 May 2020 12:48:59 +0000 (+0200) Subject: Use forward slashes instead of backslashes as directory separator on Windows X-Git-Tag: v9.17.2~55^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7208c94ee3c05a23528c9c7ec312e9e772d5df91;p=thirdparty%2Fbind9.git Use forward slashes instead of backslashes as directory separator on Windows --- diff --git a/util/check-win32util-configure b/util/check-win32util-configure index bc07b58dc56..b2556485e48 100644 --- a/util/check-win32util-configure +++ b/util/check-win32util-configure @@ -10,10 +10,9 @@ status=0 find */*/win32 win32utils -name \*.in | sed -e '/\/Makefile.in$/d' \ - -e 's/\//\\\\\\\\/g' \ -e 's/.in$/"/' \ - -e 's/^/"..\\\\\\\\/' \ - -e 's/"..\\\\\\\\win32utils\\\\\\\\/"/' | + -e 's/^/"..\//' \ + -e 's/"..\/win32utils\//"/' | while read f do if grep -F "$f" win32utils/Configure > /dev/null diff --git a/win32utils/Configure b/win32utils/Configure index adbc561c166..e33ed59215f 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -22,125 +22,125 @@ use File::Spec; # files to configure -my $configfile = "..\\config.h"; -my $platformfile = "..\\lib\\isc\\win32\\include\\isc\\platform.h"; -my @confshlist = ("..\\bin\\tests\\system\\conf.sh", - "..\\bin\\tests\\system\\run.sh", - "..\\bin\\tests\\system\\start.sh", - "..\\bin\\tests\\system\\stop.sh"); - -my @filelist = ("..\\lib\\dns\\win32\\libdns.def", - "..\\lib\\isc\\win32\\libisc.def"); - -my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", - "..\\bin\\check\\win32\\checkconf.vcxproj.filters", - "..\\bin\\check\\win32\\checktool.vcxproj", - "..\\bin\\check\\win32\\checktool.vcxproj.filters", - "..\\bin\\check\\win32\\checkzone.vcxproj", - "..\\bin\\check\\win32\\checkzone.vcxproj.filters", - "..\\bin\\confgen\\win32\\confgentool.vcxproj", - "..\\bin\\confgen\\win32\\confgentool.vcxproj.filters", - "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj", - "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj.filters", - "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj", - "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj.filters", - "..\\bin\\delv\\win32\\delv.vcxproj", - "..\\bin\\delv\\win32\\delv.vcxproj.filters", - "..\\bin\\dig\\win32\\dig.vcxproj", - "..\\bin\\dig\\win32\\dig.vcxproj.filters", - "..\\bin\\dig\\win32\\dighost.vcxproj", - "..\\bin\\dig\\win32\\dighost.vcxproj.filters", - "..\\bin\\dig\\win32\\host.vcxproj", - "..\\bin\\dig\\win32\\host.vcxproj.filters", - "..\\bin\\dig\\win32\\nslookup.vcxproj", - "..\\bin\\dig\\win32\\nslookup.vcxproj.filters", - "..\\bin\\dnssec\\win32\\cds.vcxproj", - "..\\bin\\dnssec\\win32\\cds.vcxproj.filters", - "..\\bin\\dnssec\\win32\\dnssectool.vcxproj", - "..\\bin\\dnssec\\win32\\dnssectool.vcxproj.filters", - "..\\bin\\dnssec\\win32\\dsfromkey.vcxproj", - "..\\bin\\dnssec\\win32\\dsfromkey.vcxproj.filters", - "..\\bin\\dnssec\\win32\\importkey.vcxproj", - "..\\bin\\dnssec\\win32\\importkey.vcxproj.filters", - "..\\bin\\dnssec\\win32\\keyfromlabel.vcxproj", - "..\\bin\\dnssec\\win32\\keyfromlabel.vcxproj.filters", - "..\\bin\\dnssec\\win32\\keygen.vcxproj", - "..\\bin\\dnssec\\win32\\keygen.vcxproj.filters", - "..\\bin\\dnssec\\win32\\revoke.vcxproj", - "..\\bin\\dnssec\\win32\\revoke.vcxproj.filters", - "..\\bin\\dnssec\\win32\\settime.vcxproj", - "..\\bin\\dnssec\\win32\\settime.vcxproj.filters", - "..\\bin\\dnssec\\win32\\signzone.vcxproj", - "..\\bin\\dnssec\\win32\\signzone.vcxproj.filters", - "..\\bin\\dnssec\\win32\\verify.vcxproj", - "..\\bin\\dnssec\\win32\\verify.vcxproj.filters", - "..\\bin\\named\\win32\\named.vcxproj", - "..\\bin\\named\\win32\\named.vcxproj.filters", - "..\\bin\\nsupdate\\win32\\nsupdate.vcxproj", - "..\\bin\\nsupdate\\win32\\nsupdate.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11destroy.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11destroy.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11keygen.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11keygen.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11list.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11list.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11tokens.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11tokens.vcxproj.filters", - "..\\bin\\rndc\\win32\\rndc.vcxproj", - "..\\bin\\rndc\\win32\\rndc.vcxproj.filters", - "..\\bin\\tools\\win32\\arpaname.vcxproj", - "..\\bin\\tools\\win32\\arpaname.vcxproj.filters", - "..\\bin\\tools\\win32\\journalprint.vcxproj", - "..\\bin\\tools\\win32\\journalprint.vcxproj.filters", - "..\\bin\\tools\\win32\\mdig.vcxproj", - "..\\bin\\tools\\win32\\mdig.vcxproj.filters", - "..\\bin\\tools\\win32\\nsec3hash.vcxproj", - "..\\bin\\tools\\win32\\nsec3hash.vcxproj.filters", - "..\\bin\\tools\\win32\\rrchecker.vcxproj", - "..\\bin\\tools\\win32\\rrchecker.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\bigkey.vcxproj", - "..\\bin\\tests\\system\\win32\\bigkey.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\feature-test.vcxproj", - "..\\bin\\tests\\system\\win32\\feature-test.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\gencheck.vcxproj", - "..\\bin\\tests\\system\\win32\\gencheck.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\keycreate.vcxproj", - "..\\bin\\tests\\system\\win32\\keycreate.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\keydelete.vcxproj", - "..\\bin\\tests\\system\\win32\\keydelete.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\pipequeries.vcxproj", - "..\\bin\\tests\\system\\win32\\pipequeries.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\makejournal.vcxproj", - "..\\bin\\tests\\system\\win32\\makejournal.vcxproj.filters", - "..\\bin\\win32\\BINDInstall\\BINDInstall.vcxproj", - "..\\bin\\win32\\BINDInstall\\BINDInstall.vcxproj.filters", - "..\\lib\\bind9\\win32\\libbind9.vcxproj", - "..\\lib\\bind9\\win32\\libbind9.vcxproj.filters", - "..\\lib\\dns\\win32\\gen.vcxproj", - "..\\lib\\dns\\win32\\gen.vcxproj.filters", - "..\\lib\\dns\\win32\\libdns.vcxproj", - "..\\lib\\dns\\win32\\libdns.vcxproj.filters", - "..\\lib\\irs\\win32\\libirs.vcxproj", - "..\\lib\\irs\\win32\\libirs.vcxproj.filters", - "..\\lib\\isc\\win32\\libisc.vcxproj", - "..\\lib\\isc\\win32\\libisc.vcxproj.filters", - "..\\lib\\isccc\\win32\\libisccc.vcxproj", - "..\\lib\\isccc\\win32\\libisccc.vcxproj.filters", - "..\\lib\\isccfg\\win32\\libisccfg.vcxproj", - "..\\lib\\isccfg\\win32\\libisccfg.vcxproj.filters", - "..\\lib\\ns\\win32\\libns.vcxproj", - "..\\lib\\samples\\win32\\resolve.vcxproj", - "..\\lib\\samples\\win32\\resolve.vcxproj.filters", - "..\\lib\\samples\\win32\\async.vcxproj", - "..\\lib\\samples\\win32\\async.vcxproj.filters", - "..\\lib\\samples\\win32\\update.vcxproj", - "..\\lib\\samples\\win32\\update.vcxproj.filters", - "..\\lib\\samples\\win32\\request.vcxproj", - "..\\lib\\samples\\win32\\request.vcxproj.filters", - "..\\lib\\samples\\win32\\nsprobe.vcxproj", - "..\\lib\\samples\\win32\\nsprobe.vcxproj.filters", - "..\\lib\\win32\\bindevt\\bindevt.vcxproj", - "..\\lib\\win32\\bindevt\\bindevt.vcxproj.filters", +my $configfile = "../config.h"; +my $platformfile = "../lib/isc/win32/include/isc/platform.h"; +my @confshlist = ("../bin/tests/system/conf.sh", + "../bin/tests/system/run.sh", + "../bin/tests/system/start.sh", + "../bin/tests/system/stop.sh"); + +my @filelist = ("../lib/dns/win32/libdns.def", + "../lib/isc/win32/libisc.def"); + +my @projectlist = ("../bin/check/win32/checkconf.vcxproj", + "../bin/check/win32/checkconf.vcxproj.filters", + "../bin/check/win32/checktool.vcxproj", + "../bin/check/win32/checktool.vcxproj.filters", + "../bin/check/win32/checkzone.vcxproj", + "../bin/check/win32/checkzone.vcxproj.filters", + "../bin/confgen/win32/confgentool.vcxproj", + "../bin/confgen/win32/confgentool.vcxproj.filters", + "../bin/confgen/win32/ddnsconfgen.vcxproj", + "../bin/confgen/win32/ddnsconfgen.vcxproj.filters", + "../bin/confgen/win32/rndcconfgen.vcxproj", + "../bin/confgen/win32/rndcconfgen.vcxproj.filters", + "../bin/delv/win32/delv.vcxproj", + "../bin/delv/win32/delv.vcxproj.filters", + "../bin/dig/win32/dig.vcxproj", + "../bin/dig/win32/dig.vcxproj.filters", + "../bin/dig/win32/dighost.vcxproj", + "../bin/dig/win32/dighost.vcxproj.filters", + "../bin/dig/win32/host.vcxproj", + "../bin/dig/win32/host.vcxproj.filters", + "../bin/dig/win32/nslookup.vcxproj", + "../bin/dig/win32/nslookup.vcxproj.filters", + "../bin/dnssec/win32/cds.vcxproj", + "../bin/dnssec/win32/cds.vcxproj.filters", + "../bin/dnssec/win32/dnssectool.vcxproj", + "../bin/dnssec/win32/dnssectool.vcxproj.filters", + "../bin/dnssec/win32/dsfromkey.vcxproj", + "../bin/dnssec/win32/dsfromkey.vcxproj.filters", + "../bin/dnssec/win32/importkey.vcxproj", + "../bin/dnssec/win32/importkey.vcxproj.filters", + "../bin/dnssec/win32/keyfromlabel.vcxproj", + "../bin/dnssec/win32/keyfromlabel.vcxproj.filters", + "../bin/dnssec/win32/keygen.vcxproj", + "../bin/dnssec/win32/keygen.vcxproj.filters", + "../bin/dnssec/win32/revoke.vcxproj", + "../bin/dnssec/win32/revoke.vcxproj.filters", + "../bin/dnssec/win32/settime.vcxproj", + "../bin/dnssec/win32/settime.vcxproj.filters", + "../bin/dnssec/win32/signzone.vcxproj", + "../bin/dnssec/win32/signzone.vcxproj.filters", + "../bin/dnssec/win32/verify.vcxproj", + "../bin/dnssec/win32/verify.vcxproj.filters", + "../bin/named/win32/named.vcxproj", + "../bin/named/win32/named.vcxproj.filters", + "../bin/nsupdate/win32/nsupdate.vcxproj", + "../bin/nsupdate/win32/nsupdate.vcxproj.filters", + "../bin/pkcs11/win32/pk11destroy.vcxproj", + "../bin/pkcs11/win32/pk11destroy.vcxproj.filters", + "../bin/pkcs11/win32/pk11keygen.vcxproj", + "../bin/pkcs11/win32/pk11keygen.vcxproj.filters", + "../bin/pkcs11/win32/pk11list.vcxproj", + "../bin/pkcs11/win32/pk11list.vcxproj.filters", + "../bin/pkcs11/win32/pk11tokens.vcxproj", + "../bin/pkcs11/win32/pk11tokens.vcxproj.filters", + "../bin/rndc/win32/rndc.vcxproj", + "../bin/rndc/win32/rndc.vcxproj.filters", + "../bin/tools/win32/arpaname.vcxproj", + "../bin/tools/win32/arpaname.vcxproj.filters", + "../bin/tools/win32/journalprint.vcxproj", + "../bin/tools/win32/journalprint.vcxproj.filters", + "../bin/tools/win32/mdig.vcxproj", + "../bin/tools/win32/mdig.vcxproj.filters", + "../bin/tools/win32/nsec3hash.vcxproj", + "../bin/tools/win32/nsec3hash.vcxproj.filters", + "../bin/tools/win32/rrchecker.vcxproj", + "../bin/tools/win32/rrchecker.vcxproj.filters", + "../bin/tests/system/win32/bigkey.vcxproj", + "../bin/tests/system/win32/bigkey.vcxproj.filters", + "../bin/tests/system/win32/feature-test.vcxproj", + "../bin/tests/system/win32/feature-test.vcxproj.filters", + "../bin/tests/system/win32/gencheck.vcxproj", + "../bin/tests/system/win32/gencheck.vcxproj.filters", + "../bin/tests/system/win32/keycreate.vcxproj", + "../bin/tests/system/win32/keycreate.vcxproj.filters", + "../bin/tests/system/win32/keydelete.vcxproj", + "../bin/tests/system/win32/keydelete.vcxproj.filters", + "../bin/tests/system/win32/pipequeries.vcxproj", + "../bin/tests/system/win32/pipequeries.vcxproj.filters", + "../bin/tests/system/win32/makejournal.vcxproj", + "../bin/tests/system/win32/makejournal.vcxproj.filters", + "../bin/win32/BINDInstall/BINDInstall.vcxproj", + "../bin/win32/BINDInstall/BINDInstall.vcxproj.filters", + "../lib/bind9/win32/libbind9.vcxproj", + "../lib/bind9/win32/libbind9.vcxproj.filters", + "../lib/dns/win32/gen.vcxproj", + "../lib/dns/win32/gen.vcxproj.filters", + "../lib/dns/win32/libdns.vcxproj", + "../lib/dns/win32/libdns.vcxproj.filters", + "../lib/irs/win32/libirs.vcxproj", + "../lib/irs/win32/libirs.vcxproj.filters", + "../lib/isc/win32/libisc.vcxproj", + "../lib/isc/win32/libisc.vcxproj.filters", + "../lib/isccc/win32/libisccc.vcxproj", + "../lib/isccc/win32/libisccc.vcxproj.filters", + "../lib/isccfg/win32/libisccfg.vcxproj", + "../lib/isccfg/win32/libisccfg.vcxproj.filters", + "../lib/ns/win32/libns.vcxproj", + "../lib/samples/win32/resolve.vcxproj", + "../lib/samples/win32/resolve.vcxproj.filters", + "../lib/samples/win32/async.vcxproj", + "../lib/samples/win32/async.vcxproj.filters", + "../lib/samples/win32/update.vcxproj", + "../lib/samples/win32/update.vcxproj.filters", + "../lib/samples/win32/request.vcxproj", + "../lib/samples/win32/request.vcxproj.filters", + "../lib/samples/win32/nsprobe.vcxproj", + "../lib/samples/win32/nsprobe.vcxproj.filters", + "../lib/win32/bindevt/bindevt.vcxproj", + "../lib/win32/bindevt/bindevt.vcxproj.filters", "bind9.sln"); # for config.h @@ -442,30 +442,30 @@ my $use_tests = "no"; my $use_stests = "no"; my $use_samples = "no"; my $use_libuv = "auto"; -my $libuv_path = "..\\..\\"; +my $libuv_path = "../../"; my $use_openssl = "auto"; -my $openssl_path = "..\\..\\"; +my $openssl_path = "../../"; my $use_pkcs11 = "no"; my $pkcs11_path = "unknown"; my $use_aes = "auto"; my $use_gssapi = "no"; my $validation_default = "auto"; -my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\"; +my $gssapi_path = "C:/Program\ Files/MIT/Kerberos/"; my $use_geoip2 = "no"; my $geoip2_path = ""; my $use_libxml2 = "auto"; -my $libxml2_path = "..\\..\\"; +my $libxml2_path = "../../"; my $with_pssuspend = "no"; my $pssuspend_command = "pssuspend.exe"; my $use_python = "auto"; my $python_command = "python.exe"; my $use_readline = "no"; -my $readline_path = "..\\..\\"; +my $readline_path = "../../"; my $use_idn = "no"; -my $idn_path = "..\\..\\"; +my $idn_path = "../../"; my $iconv_path = " --idn-- "; my $use_zlib = "no"; -my $zlib_path = "..\\..\\"; +my $zlib_path = "../../"; my $use_vcredist = "yes"; my $vcredist_path = " --infer-- "; my $cross_compile = "no"; @@ -530,7 +530,7 @@ if ($want_checkfiles eq "yes") { my $status=0; foreach (@filelist) { my $name = $_; - $name =~ s/\\/\\\\/g; + $name =~ s/\\/\//g; next if -r $_ . ".in"; s/\\/\//g; next if -r $_ . ".in"; @@ -539,7 +539,7 @@ if ($want_checkfiles eq "yes") { } foreach (@projectlist) { my $name = $_; - $name =~ s/\\/\\\\/g; + $name =~ s/\\/\//g; next if -r $_ . ".in"; s/\\/\//g; next if -r $_ . ".in"; @@ -570,9 +570,9 @@ $configvar{"EXEEXT"} = ".exe"; $configtest{"builddir"} = kw("."); $configtest{"srcdir"} = kw("."); $configtest{"abs_top_builddir"} = kw($abs_top_builddir); -$configtest{"abs_top_builddir"} =~ s/\\/\\\\/g; +$configtest{"abs_top_builddir"} =~ s/\\/\//g; $configtest{"abs_top_srcdir"} = kw($abs_top_srcdir); -$configtest{"abs_top_srcdir"} =~ s/\\/\\\\/g; +$configtest{"abs_top_srcdir"} =~ s/\\/\//g; # Mimic AC_INIT() from autoconf by loading values from configure.ac @@ -589,7 +589,7 @@ sub ac_init { my $package_srcid; my $mapapi; - open V, "..\\configure.ac" || die $!; + open V, "../configure.ac" || die $!; while () { chomp; if (/^AC_INIT\(\[(.*?)\],\s*bind_PKG_VERSION,\s*\[(.*?)\],\s*\[(.*?)\],\s*\[(.*?)\]\)$/) { @@ -614,7 +614,7 @@ sub ac_init { $package_version = "${package_version_major}.${package_version_minor}.${package_version_patch}${package_version_extra}"; - my $srcid_fn = "..\\srcid"; + my $srcid_fn = "../srcid"; if (-f $srcid_fn) { open(my $fh, '<', $srcid_fn) or die "cannot open file $srcid_fn"; @@ -623,7 +623,7 @@ sub ac_init { $package_srcid = <$fh>; } close($fh); - } elsif (-d "..\\.git") { + } elsif (-d "../.git") { $package_srcid = substr(`git rev-list --max-count=1 HEAD`, 0, 7); } else { $package_srcid = ""; @@ -803,7 +803,7 @@ sub mywith { if ($val !~ /^yes$/i) { $geoip2_path = $val; } else { - $geoip2_path = "..\\..\\GeoIP2"; + $geoip2_path = "../../GeoIP2"; } } } elsif ($key =~ /^readline$/i) { @@ -1118,8 +1118,8 @@ main(void) EOF close F; my $compret = `cl /nologo /MD mscver.c`; -if (grep { -f and -x } ".\\mscver.exe") { - $msc_ver = `.\\mscver.exe`; +if (grep { -f and -x } "./mscver.exe") { + $msc_ver = `./mscver.exe`; } else { die "can't get _MSC_VER value: $compret\n"; } @@ -1188,8 +1188,8 @@ main(void) EOF close F; my $compret = `cl /nologo /MD cross.c`; - if (grep { -f and -x } ".\\cross.exe") { - my $cross = `.\\cross.exe`; + if (grep { -f and -x } "./cross.exe") { + my $cross = `./cross.exe`; if ($cross) { print STDERR $cross; } @@ -1213,8 +1213,8 @@ main(void) EOF close F; my $compret = `cl /nologo /MD cross.c`; - if (grep { -f and -x } ".\\cross.exe") { - my $cross = `.\\cross.exe`; + if (grep { -f and -x } "./cross.exe") { + my $cross = `./cross.exe`; if ($cross) { print STDERR $cross; } @@ -1358,14 +1358,14 @@ if ($use_openssl eq "auto") { foreach $file (sort {uc($b) cmp uc($a)} @dirlist) { if (-f File::Spec->catfile($openssl_path, $file, - "inc32\\openssl\\opensslv.h")) { + "inc32/openssl/opensslv.h")) { $openssl_path = File::Spec->catdir($openssl_path, $file); $use_openssl = "yes"; last; } if (-f File::Spec->catfile($openssl_path, $file, - "include\\openssl\\opensslv.h")) { + "include/openssl/opensslv.h")) { $openssl_path = File::Spec->catdir($openssl_path, $file); $use_openssl = "yes"; last; @@ -1385,10 +1385,10 @@ if ($use_openssl eq "yes") { } my $openssl_new = 0; if (!-f File::Spec->catfile($openssl_path, - "inc32\\openssl\\opensslv.h")) { + "inc32/openssl/opensslv.h")) { $openssl_new = 1; if (!-f File::Spec->catfile($openssl_path, - "include\\openssl\\opensslv.h")) { + "include/openssl/opensslv.h")) { die "can't find OpenSSL opensslv.h include\n"; } } @@ -1468,8 +1468,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" testossl.c "$library"`; - if (grep { -f and -x } ".\\testossl.exe") { - `.\\testossl.exe`; + if (grep { -f and -x } "./testossl.exe") { + `./testossl.exe`; if ($? != 0) { die "OpenSSL test failed\n"; } @@ -1502,8 +1502,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" testosslv.c "$library"`; - if (grep { -f and -x } ".\\testosslv.exe") { - `.\\testosslv.exe`; + if (grep { -f and -x } "./testosslv.exe") { + `./testosslv.exe`; if ($? != 0) { die "OpenSSL version test failed\n"; } @@ -1536,8 +1536,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" testosslfunc.c "$library"`; - if (grep { -f and -x } ".\\testosslfunc.exe") { - `.\\testosslfunc.exe`; + if (grep { -f and -x } "./testosslfunc.exe") { + `./testosslfunc.exe`; if ($? == 0) { $configdefh{"HAVE_DH_GET0_KEY"} = 1; $configdefh{"HAVE_ECDSA_SIG_GET0"} = 1; @@ -1580,8 +1580,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" tested25519.c "$library"`; - if (grep { -f and -x } ".\\tested25519.exe") { - `.\\tested25519.exe`; + if (grep { -f and -x } "./tested25519.exe") { + `./tested25519.exe`; if ($? == 0) { $configdefh{"HAVE_OPENSSL_ED25519"} = 1; } else { @@ -1621,8 +1621,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" tested448.c "$library"`; - if (grep { -f and -x } ".\\tested448.exe") { - `.\\tested448.exe`; + if (grep { -f and -x } "./tested448.exe") { + `./tested448.exe`; if ($? == 0) { $configdefh{"HAVE_OPENSSL_ED448"} = 1; } else { @@ -1806,8 +1806,8 @@ int main(void) { EOF close F; $compret = `cl /nologo $geoip_inc /MD testgeoip2.c $geoip2_libs`; - if (grep { -f and -x } ".\\testgeoip2.exe") { - `.\\testgeoip2.exe`; + if (grep { -f and -x } "./testgeoip2.exe") { + `./testgeoip2.exe`; if ($? == 0) { die "GeoIP2 test failed\n"; } @@ -1858,7 +1858,7 @@ if ($use_idn eq "no") { print "checking for IDN kit directory at \"$idn_path\"\n"; } if (!-f File::Spec->catfile($idn_path, "idn", "api.h")) { - die "can't find idn\\api.h include\n"; + die "can't find idn/api.h include\n"; } if (!-f File::Spec->catfile($idn_path, "idn", "idnkit.lib")) { die "can't find idnkit.lib library\n"; @@ -1877,7 +1877,7 @@ if ($use_idn eq "no") { my $iconv_dll = File::Spec->catfile($idn_path, "idn", "iconv.dll"); $configdll{"ICONV_DLL"} = "$iconv_dll"; } else { - my $iconv_dll =File::Spec->catfile($iconv_path, "iconv.dll"); + my $iconv_dll = File::Spec->catfile($iconv_path, "iconv.dll"); $configdll{"ICONV_DLL"} = "$iconv_dll"; } } @@ -1906,7 +1906,7 @@ if ($use_libxml2 eq "no") { foreach $file (sort {uc($b) cmp uc($a)} @dirlist) { if (-f File::Spec->catfile($libxml2_path, $file, - "include\\libxml", + "include", "libxml", "xmlversion.h")) { $libxml2_path = File::Spec->catdir($libxml2_path, $file); $use_libxml2 = "yes"; @@ -1926,17 +1926,17 @@ if ($use_libxml2 eq "yes") { print "checking for libxml2 built directory at \"$libxml2_path\"\n"; } if (!-f File::Spec->catfile($libxml2_path, - "include\\libxml", + "include" , "libxml", "xmlversion.h")) { die "can't find libxml2 xmlversion.h include\n"; } if (!-f File::Spec->catfile($libxml2_path, - "win32\\bin.msvc", + "win32" , "bin.msvc", "libxml2.lib")) { die "can't find Libxml2 libxml2.lib library\n"; } if (!-f File::Spec->catfile($libxml2_path, - "win32\\bin.msvc", + "win32", "bin.msvc", "libxml2.dll")) { die "can't find Libxml2 DLL\n"; } @@ -1945,7 +1945,7 @@ if ($use_libxml2 eq "yes") { $configtest{"XMLSTATS"} = 1; my $libxml2_inc = File::Spec->catdir($libxml2_path, "include"); $configinc{"LIBXML2_INC"} = "$libxml2_inc"; - my $libxml2_libdir = File::Spec->catdir($libxml2_path, "win32\\bin.msvc"); + my $libxml2_libdir = File::Spec->catdir($libxml2_path, "win32", "bin.msvc"); my $libxml2_lib = File::Spec->catfile($libxml2_libdir, "libxml2.lib"); $configlib{"LIBXML2_LIB"} = "$libxml2_lib"; my $libxml2_dll = File::Spec->catfile($libxml2_libdir, "libxml2.dll"); @@ -2139,16 +2139,16 @@ sub setupconfsh { $val = kw($configtest{$1}); } elsif ($1 eq "abs_builddir") { $val = kw(File::Spec->rel2abs($confshdirectory, File::Spec->curdir())); - $val =~ s/\\/\\\\/g; + $val =~ s/\\/\//g; } elsif ($1 eq "abs_srcdir") { $val = kw(File::Spec->rel2abs($confshdirectory, File::Spec->curdir())); - $val =~ s/\\/\\\\/g; + $val =~ s/\\/\//g; } elsif ($1 eq "top_builddir") { $val = kw(File::Spec->abs2rel($top_builddir, $confshdirectory)); - $val =~ s/\\/\\\\/g; + $val =~ s/\\/\//g; } elsif ($1 eq "top_srcdir") { $val = kw(File::Spec->abs2rel($top_srcdir, $confshdirectory)); - $val =~ s/\\/\\\\/g; + $val =~ s/\\/\//g; } else { $val = ""; } @@ -2418,10 +2418,10 @@ sub setupproject { # Keep this in sync with util/bindkeys.pl sub makebindkeysh { - my $bindkeysh = `perl.exe ..\\util\\bindkeys.pl ..\\bind.keys`; + my $bindkeysh = `perl.exe ../util/bindkeys.pl ../bind.keys`; die "Failed to generate bind.keys.h!\n" unless (length($bindkeysh)); - open(my $fout, ">" . "..\\bind.keys.h") || die $!; + open(my $fout, ">" . "../bind.keys.h") || die $!; print $fout $bindkeysh; close($fout); }