Commit 04d816ce8764332f3b266b32695d1b68a2db801e
2023-12-06T22:34:02
fix compilation without -framework Cocoa
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
diff --git a/config.subr b/config.subr
index 6abad1c..0974221 100644
--- a/config.subr
+++ b/config.subr
@@ -96,12 +96,13 @@ config_include() {
rm -f "$OUT"
}
-config_lib_have() {
+config_include_have() {
NAME="$1"
shift
OUT_C=".config_$NAME.c"
OUT=".config_$NAME"
echo "/* generated by configure */" > "$OUT_C"
+ echo "$@" >> "$OUT_C"
echo "int main (void) { return 0; }" >> "$OUT_C"
if $LIBTOOL --tag CC --mode link ${CC} ${CPPFLAGS} ${CFLAGS} "$OUT_C" ${LIBS} $@ -o "$OUT"; then
eval "HAVE_$NAME=true"
@@ -126,6 +127,23 @@ config_lib() {
rm -f "$OUT" "$OUT_C"
}
+config_lib_have() {
+ NAME="$1"
+ shift
+ OUT_C=".config_$NAME.c"
+ OUT=".config_$NAME"
+ echo "/* generated by configure */" > "$OUT_C"
+ echo "int main (void) { return 0; }" >> "$OUT_C"
+ if $LIBTOOL --tag CC --mode link ${CC} ${CPPFLAGS} ${CFLAGS} "$OUT_C" ${LIBS} $@ -o "$OUT"; then
+ eval "HAVE_$NAME=true"
+ echo "HAVE_$NAME = true" >> ${CONFIG_MK}
+ else
+ eval "HAVE_$NAME=false"
+ echo "HAVE_$NAME = false" >> ${CONFIG_MK}
+ fi
+ rm -f "$OUT" "$OUT_C"
+}
+
config_no_undefined() {
OUT_C=".config_no_undefined.c"
OUT=".config_no_undefined"
diff --git a/libc3/window/cairo/configure b/libc3/window/cairo/configure
index 390fb25..07e9b07 100755
--- a/libc3/window/cairo/configure
+++ b/libc3/window/cairo/configure
@@ -47,6 +47,9 @@ pkg_config cairo
pkg_config freetype2
pkg_config xkbcommon
config_lib_have COCOA -framework Cocoa
+if $HAVE_COCOA; then
+ config_include_have COCOA '#import <Cocoa/Cocoa.h>'
+fi
config_define PREFIX "\"${PREFIX}\""
# Address Sanitizer config
diff --git a/libc3/window/cairo/demo/.config_no_undefined.c b/libc3/window/cairo/demo/.config_no_undefined.c
deleted file mode 100644
index 2e12ed6..0000000
--- a/libc3/window/cairo/demo/.config_no_undefined.c
+++ /dev/null
@@ -1,2 +0,0 @@
-/* generated by configure */
-int main (void) { return 0; }