projects
/
awesomized
/
ext-ion
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
61749e9
)
docker: fix build without submodule
author
Michael Wallner
<mike@php.net>
Thu, 20 Jan 2022 17:26:47 +0000
(18:26 +0100)
committer
Michael Wallner
<mike@php.net>
Thu, 20 Jan 2022 17:26:47 +0000
(18:26 +0100)
config.m4
patch
|
blob
|
history
diff --git
a/config.m4
b/config.m4
index ad903f9a2b73ca15c0385087637b2c4e5a716963..a0591d71f06e086a627ec0603ba43c23eaf6256e 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-13,14
+13,6
@@
AC_ARG_VAR([CMAKE], [cmake executable])
AC_PATH_PROG([CMAKE], [cmake])
PHP_SUBST([CMAKE])
AC_PATH_PROG([CMAKE], [cmake])
PHP_SUBST([CMAKE])
-AC_ARG_VAR([AR], [system library archiver])
-AC_PATH_PROG([AR], [ar])
-PHP_SUBST([AR])
-
-AC_ARG_VAR([RANLIB], [system library archive indexer])
-AC_PATH_PROG([RANLIB], [ranlib])
-PHP_SUBST([RANLIB])
-
use_bundled_ionc=false
AC_DEFUN([ION_BUNDLE], [dnl
use_bundled_ionc=false
AC_DEFUN([ION_BUNDLE], [dnl
@@
-33,6
+25,8
@@
AC_DEFUN([ION_BUNDLE], [dnl
"$GIT" submodule update --init --depth 1 --recursive ion-c; then
AC_MSG_ERROR([giving up])
fi
"$GIT" submodule update --init --depth 1 --recursive ion-c; then
AC_MSG_ERROR([giving up])
fi
+ elif "$GIT" clone -q --depth 1 --recursive https://github.com/amzn/ion-c PHP_EXT_SRCDIR([ion])/ion-c; then
+ AC_MSG_RESULT([git clone])
else
AC_MSG_RESULT([not found])
AC_MSG_ERROR([invalid bundle: PHP_EXT_SRCDIR([ion])/ion-c])
else
AC_MSG_RESULT([not found])
AC_MSG_ERROR([invalid bundle: PHP_EXT_SRCDIR([ion])/ion-c])