Commit be5abac8f92ba0b01b6db9d3b374622c86fa9da1

Thomas de Grivel 2023-01-25T10:36:38

configure

diff --git a/configure b/configure
index e694ae4..139382c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 ## c3
-## Copyright 2022 kmx.io <contact@kmx.io>
+## Copyright 2022,2023 kmx.io <contact@kmx.io>
 ##
 ## Permission is hereby granted to use this software excepted
 ## on Apple computers granted the above copyright notice and
@@ -23,27 +23,19 @@ if [ "x$1" = "x--prefix" ]; then
 fi
 export PREFIX
 
-( cd libtommath && ./configure; )
-( cd ucd2c && ./configure; )
-( cd libc3 && ./configure; )
-( cd ic3 && ./configure; )
-( cd c3s && ./configure; )
-( cd test && ./configure; )
-
 . ./config.subr
 
-C3_DIRS="ic3 libc3 test"
-C3_CONFIGURES="$(find . -name "configure" | tr '\n' ' ')"
-C3_MAKEFILES="$(find . -name "Makefile" | tr '\n' ' ')"
-C3_C_SOURCES="$(find $C3_DIRS -name "[a-z]*.c" -or -name "[a-z]*.h" -or -name "[a-z]*.c.in" -or -name "[a-z]*.h.in" | tr '\n' ' ')"
-C3_C_SOURCES="$C3_C_SOURCES ucd2c/ucd.h"
-
-echo "C3_CONFIGURES = $C3_CONFIGURES" >> ${CONFIG_MK}
-echo "C3_MAKEFILES = $C3_MAKEFILES" >> ${CONFIG_MK}
-echo "C3_C_SOURCES = $C3_C_SOURCES" >> ${CONFIG_MK}
+require_pkg_config
 
 C3_VERSION="$(cat c3.version)"
 echo "C3_VERSION = $C3_VERSION" >> ${CONFIG_MK}
 echo "c3-${C3_VERSION}.tar.gz: $(tr '\n' ' ' < c3.index)" >> ${CONFIG_MK}
 
 update_config_mk
+
+( cd libtommath && ./configure; )
+( cd ucd2c && ./configure; )
+( cd libc3 && ./configure; )
+( cd ic3 && ./configure; )
+( cd c3s && ./configure; )
+( cd test && ./configure; )