Commit b88198bd9384dbbe6ffde745cef281a65a3bb9ba
2025-02-15T01:00:44
config_common
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/config_common b/config_common
new file mode 100644
index 0000000..26b7588
--- /dev/null
+++ b/config_common
@@ -0,0 +1,30 @@
+# -*- sh -*-
+# Common config for all targets
+CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic -pipe -pthread"
+CXXFLAGS="$CXXFLAGS -W -Wall -Werror -std=c++11 -pedantic -pipe -pthread"
+LDFLAGS="-export-dynamic $LDFLAGS -rdynamic"
+config_asan
+config_gnu
+config_i386
+config_win32
+config_win64
+#if $HAVE_WIN32; then
+# CPPFLAGS="$CPPFLAGS -I../sys_wait_h/"
+#fi
+pkg_config libbsd-overlay
+pkg_config libffi
+pkg_config libmd
+config_lib libmd -lmd 2>/dev/null
+config_lib dl -ldl
+config_define PREFIX "\"${PREFIX}\""
+config_have_crypt_newhash
+config_have_stat_mtim
+config_have_pthread
+update_config_h
+LIBS="$LIBS -lm -lpthread -rpath ${PREFIX}/lib"
+if $HAVE_WIN32 || $HAVE_WIN64; then
+ LIBS="$LIBS -lws2_32"
+fi
+if ! [ -f ../ucd2c/ucd.c ]; then
+ touch ../ucd2c/ucd.c
+fi
diff --git a/libkc3/configure b/libkc3/configure
index a51b0a0..a986de1 100755
--- a/libkc3/configure
+++ b/libkc3/configure
@@ -39,36 +39,7 @@ OBJECTS_ASAN="$(c2ext .asan.lo "$LO_SOURCES") $(cxx2ext .asan.lo "$SOURCES_CXX")
OBJECTS_COV="$(c2ext .cov.lo "$LO_SOURCES") $(cxx2ext .cov.lo "$SOURCES_CXX")"
OBJECTS_DEBUG="$(c2ext .debug.lo "$LO_SOURCES") $(cxx2ext .debug.lo "$SOURCES_CXX")"
-# Common config for all targets
-CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic -pipe -pthread"
-CXXFLAGS="$CXXFLAGS -W -Wall -Werror -std=c++11 -pedantic -pipe -pthread"
-LDFLAGS="-export-dynamic $LDFLAGS -rdynamic"
-config_asan
-config_gnu
-config_i386
-config_win32
-config_win64
-if $HAVE_WIN32; then
- CPPFLAGS="$CPPFLAGS -I../sys_wait_h/"
-fi
-pkg_config libbsd-overlay
-pkg_config libffi
-pkg_config libmd
-config_lib libmd -lmd 2>/dev/null
-config_lib dl -ldl
-config_define PREFIX "\"${PREFIX}\""
-config_have_crypt_newhash
-config_have_stat_mtim
-config_have_pthread
-update_config_h
-LIBS="$LIBS -lm -lpthread -rpath ${PREFIX}/lib"
-if $HAVE_WIN32 || $HAVE_WIN64; then
- LIBS="$LIBS -lws2_32"
-fi
-
-if ! [ -f ../ucd2c/ucd.c ]; then
- touch ../ucd2c/ucd.c
-fi
+. "${SRC_TOP}/config_common"
# Address Sanitizer config
CPPFLAGS_ASAN="$CPPFLAGS"