Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix checks for submodules when using configure --srcdir option

Browse Source 
In this case ac_confdir variable is not set, but srcdir still is, so
just use the standard (and also more clear) variable instead.

See https://github.com/wxWidgets/wxWidgets/pull/1954

Closes #19236.
This commit is contained in:
Vadim Zeitlin
2021-08-02 19:23:40 +02:00
parent a4a65f16f6
commit bdee83d5ff
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@@ -21695,12 +21695,12 @@ fi
if test "$wxUSE_REGEX" = "builtin"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pcre submodule exists" >&5
$as_echo_n "checking whether pcre submodule exists... " >&6; }
if ! test -f "$ac_confdir/3rdparty/pcre/pcre2-config.in" ; then
if ! test -f "$srcdir/3rdparty/pcre/pcre2-config.in" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
Configured to use built-in PCRE library, but the file
$ac_confdir/3rdparty/pcre/pcre2-config.in couldn't be found.
$srcdir/3rdparty/pcre/pcre2-config.in couldn't be found.
You might need to run:
git submodule update --init 3rdparty/pcre
@@ -21953,12 +21953,12 @@ $as_echo "$as_me: WARNING: zlib library not found or too old, will use built-in
if test "$wxUSE_ZLIB" = "builtin" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether zlib.h file exists" >&5
$as_echo_n "checking whether zlib.h file exists... " >&6; }
if ! test -f "$ac_confdir/src/zlib/zlib.h" ; then
if ! test -f "$srcdir/src/zlib/zlib.h" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
Configured to use built-in zlib library, but the required file
$ac_confdir/src/zlib/zlib.h couldn't be found.
$srcdir/src/zlib/zlib.h couldn't be found.
You might need to run
git submodule update --init src/zlib
@@ -22089,12 +22089,12 @@ $as_echo "$as_me: WARNING: system png library not found or too old, will use bui
if test "$wxUSE_LIBPNG" = "builtin" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether png.c file exists" >&5
$as_echo_n "checking whether png.c file exists... " >&6; }
if ! test -f "$ac_confdir/src/png/png.c" ; then
if ! test -f "$srcdir/src/png/png.c" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
Configured to use built-in png library, but the required file
$ac_confdir/src/png/png.c couldn't be found.
$srcdir/src/png/png.c couldn't be found.
You might need to run
git submodule update --init src/png
@@ -22264,12 +22264,12 @@ fi
if test "$wxUSE_LIBJPEG" = "builtin" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether jpeglib.h file exists" >&5
$as_echo_n "checking whether jpeglib.h file exists... " >&6; }
if ! test -f "$ac_confdir/src/jpeg/jpeglib.h" ; then
if ! test -f "$srcdir/src/jpeg/jpeglib.h" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
Configured to use built-in jpeg library, but the required file
$ac_confdir/src/jpeg/jpeglib.h couldn't be found.
$srcdir/src/jpeg/jpeglib.h couldn't be found.
You might need to run
git submodule update --init src/jpeg
@@ -22619,12 +22619,12 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
if test "$wxUSE_LIBTIFF" = "builtin" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tiff.h file exists" >&5
$as_echo_n "checking whether tiff.h file exists... " >&6; }
if ! test -f "$ac_confdir/src/tiff/libtiff/tiff.h" ; then
if ! test -f "$srcdir/src/tiff/libtiff/tiff.h" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
Configured to use built-in tiff library, but the required file
$ac_confdir/src/tiff/libtiff/tiff.h couldn't be found.
$srcdir/src/tiff/libtiff/tiff.h couldn't be found.
You might need to run:
git submodule update --init src/tiff
@@ -22883,12 +22883,12 @@ $as_echo "$as_me: WARNING: system expat library not found, will use built-in ins
if test "$wxUSE_EXPAT" = "builtin" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether expat.h file exists" >&5
$as_echo_n "checking whether expat.h file exists... " >&6; }
if ! test -f "$ac_confdir/src/expat/expat/lib/expat.h" ; then
if ! test -f "$srcdir/src/expat/expat/lib/expat.h" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
Configured to use built-in expat library, but the required file
$ac_confdir/src/expat/expat/lib/expat.h couldn't be found.
$srcdir/src/expat/expat/lib/expat.h couldn't be found.
You might need to run:
git submodule update --init src/expat
@@ -41255,12 +41255,12 @@ if test "$wxUSE_TESTS_SUBDIR" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether catch.hpp file exists" >&5
$as_echo_n "checking whether catch.hpp file exists... " >&6; }
if ! test -f "$ac_confdir/3rdparty/catch/include/catch.hpp" ; then
if ! test -f "$srcdir/3rdparty/catch/include/catch.hpp" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
CATCH (C++ Automated Test Cases in Headers) is required, the required file
$ac_confdir/3rdparty/catch/include/catch.hpp couldn't be found.
$srcdir/3rdparty/catch/include/catch.hpp couldn't be found.
You might need to run

28
configure.in
View File

@@ -2439,11 +2439,11 @@ if test "$wxUSE_REGEX" != "no"; then
dnl the system one was not found, build it.
if test "$wxUSE_REGEX" = "builtin"; then
AC_MSG_CHECKING([whether pcre submodule exists])
if ! test -f "$ac_confdir/3rdparty/pcre/pcre2-config.in" ; then
if ! test -f "$srcdir/3rdparty/pcre/pcre2-config.in" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
Configured to use built-in PCRE library, but the file
$ac_confdir/3rdparty/pcre/pcre2-config.in couldn't be found.
$srcdir/3rdparty/pcre/pcre2-config.in couldn't be found.
You might need to run:
git submodule update --init 3rdparty/pcre
@@ -2537,11 +2537,11 @@ if test "$wxUSE_ZLIB" != "no" ; then
dnl Would be available when downloaded as a zipped or tarball release.
if test "$wxUSE_ZLIB" = "builtin" ; then
AC_MSG_CHECKING([whether zlib.h file exists])
if ! test -f "$ac_confdir/src/zlib/zlib.h" ; then
if ! test -f "$srcdir/src/zlib/zlib.h" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
Configured to use built-in zlib library, but the required file
$ac_confdir/src/zlib/zlib.h couldn't be found.
$srcdir/src/zlib/zlib.h couldn't be found.
You might need to run
git submodule update --init src/zlib
@@ -2617,11 +2617,11 @@ if test "$wxUSE_LIBPNG" != "no" ; then
dnl Would be available when downloaded as a zipped or tarball release.
if test "$wxUSE_LIBPNG" = "builtin" ; then
AC_MSG_CHECKING([whether png.c file exists])
if ! test -f "$ac_confdir/src/png/png.c" ; then
if ! test -f "$srcdir/src/png/png.c" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
Configured to use built-in png library, but the required file
$ac_confdir/src/png/png.c couldn't be found.
$srcdir/src/png/png.c couldn't be found.
You might need to run
git submodule update --init src/png
@@ -2709,11 +2709,11 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
dnl Would be available when downloaded as a zipped or tarball release.
if test "$wxUSE_LIBJPEG" = "builtin" ; then
AC_MSG_CHECKING([whether jpeglib.h file exists])
if ! test -f "$ac_confdir/src/jpeg/jpeglib.h" ; then
if ! test -f "$srcdir/src/jpeg/jpeglib.h" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
Configured to use built-in jpeg library, but the required file
$ac_confdir/src/jpeg/jpeglib.h couldn't be found.
$srcdir/src/jpeg/jpeglib.h couldn't be found.
You might need to run
git submodule update --init src/jpeg
@@ -2818,11 +2818,11 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
if test "$wxUSE_LIBTIFF" = "builtin" ; then
dnl Test for built-in tiff library avalability.
AC_MSG_CHECKING([whether tiff.h file exists])
if ! test -f "$ac_confdir/src/tiff/libtiff/tiff.h" ; then
if ! test -f "$srcdir/src/tiff/libtiff/tiff.h" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
Configured to use built-in tiff library, but the required file
$ac_confdir/src/tiff/libtiff/tiff.h couldn't be found.
$srcdir/src/tiff/libtiff/tiff.h couldn't be found.
You might need to run:
git submodule update --init src/tiff
@@ -2907,11 +2907,11 @@ if test "$wxUSE_EXPAT" != "no"; then
if test "$wxUSE_EXPAT" = "builtin" ; then
dnl Test for built-in expat library avalability.
AC_MSG_CHECKING([whether expat.h file exists])
if ! test -f "$ac_confdir/src/expat/expat/lib/expat.h" ; then
if ! test -f "$srcdir/src/expat/expat/lib/expat.h" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
Configured to use built-in expat library, but the required file
$ac_confdir/src/expat/expat/lib/expat.h couldn't be found.
$srcdir/src/expat/expat/lib/expat.h couldn't be found.
You might need to run:
git submodule update --init src/expat
@@ -8706,11 +8706,11 @@ if test "$wxUSE_TESTS_SUBDIR" != "no"; then
dnl Check for catch (C++ Automated Test Cases in Headers) availability.
AC_MSG_CHECKING([whether catch.hpp file exists])
if ! test -f "$ac_confdir/3rdparty/catch/include/catch.hpp" ; then
if ! test -f "$srcdir/3rdparty/catch/include/catch.hpp" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
CATCH (C++ Automated Test Cases in Headers) is required, the required file
$ac_confdir/3rdparty/catch/include/catch.hpp couldn't be found.
$srcdir/3rdparty/catch/include/catch.hpp couldn't be found.
You might need to run