diff options
| author | ruki <[email protected]> | 2018-12-06 00:37:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-12-05 21:47:05 +0800 |
| commit | 89e5de56f521e502db4311b99ed3f2fc5c196d1e (patch) | |
| tree | c70629cafeef6a4476eb487c5eb2dc953118cc1b | |
| parent | c1ee73d2858c02e66e2e8af3f18e6fff777758cf (diff) | |
improve to run autoconf
| -rw-r--r-- | xmake/actions/build/trybuild.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/package/tools/autoconf.lua | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/xmake/actions/build/trybuild.lua b/xmake/actions/build/trybuild.lua index 898aae7c5..e76354854 100644 --- a/xmake/actions/build/trybuild.lua +++ b/xmake/actions/build/trybuild.lua @@ -34,8 +34,12 @@ end -- try building for configure function _build_for_configure(buildfile) - if not os.isfile("configure") and os.isfile("configure.ac") then - os.vrun("autoreconf --install --symlink") + if not os.isfile("configure") then + if os.isfile("autogen.sh") then + os.vrunv("sh", {"./autogen.sh"}) + elseif os.isfile("configure.ac") then + os.vrun("autoreconf --install --symlink") + end end os.vrun("./configure --prefix=%s", path.absolute("install")) os.vrun("make -j4") diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index d78e6cc68..bfa6e2e1a 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -28,7 +28,7 @@ function install(package, configs) -- generate configure file if not os.isfile("configure") then if os.isfile("autogen.sh") then - os.vrun("./autogen.sh") + os.vrunv("sh", {"./autogen.sh"}) elseif os.isfile("configure.ac") then os.vrun("autoreconf --install --symlink") end |