summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-21 17:48:09 -0400
committerJune McEnroe <june@causal.agency>2020-07-21 17:49:34 -0400
commit3f5ba5cc851829c6d5c8bf4150921c3cf695a73e (patch)
treee75bf740814a4dddbeb1f697b09e4c86e19e2618
parentFilter networks with only private contexts from recents as well (diff)
downloadscooper-3f5ba5cc851829c6d5c8bf4150921c3cf695a73e.tar.gz
scooper-3f5ba5cc851829c6d5c8bf4150921c3cf695a73e.zip
Use a .pc file to configure
-rw-r--r--README.716
-rwxr-xr-xconfigure8
-rw-r--r--scooper.pc7
3 files changed, 15 insertions, 16 deletions
diff --git a/README.7 b/README.7
index 0edb5c3..1dc7bf9 100644
--- a/README.7
+++ b/README.7
@@ -1,4 +1,4 @@
-.Dd July 18, 2020
+.Dd July 21, 2020
 .Dt README 7
 .Os "Causal Agency"
 .
@@ -21,30 +21,24 @@ targets
 .Fx
 and requires
 .Lk "https://kristaps.bsd.lv/kcgi/" kcgi
-.Po
-.Fl lkcgi
-.Fl lkcgihtml
-.Pc
-and SQLite
-.Pq Fl lsqlite3 .
+and SQLite.
 .
 .Bd -literal -offset indent
-\&./configure
+\&./configure --static
 make all
 make install
 .Ed
 .
 .Pp
-By default,
 .Nm
-is statically linked
+should be statically linked
 so it can easily run in
 .Xr chroot 2
 with
 .Xr kfcgi 8 .
 The default install
 .Ev PREFIX
-is also set to
+is set to
 .Pa ~/.local ,
 which is a convenient
 .Xr chroot 2
diff --git a/configure b/configure
index 9cea63b..ab23150 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
 #!/bin/sh
 set -eu
 
-libs='kcgi kcgi-html sqlite3'
-pkg-config --print-errors $libs
+pkg-config "$@" --print-errors scooper.pc
 
 cat >config.mk <<EOF
-CFLAGS += $(pkg-config --static --cflags $libs)
-LDFLAGS += -static $(pkg-config --static --libs-only-L $libs)
-LDLIBS = $(pkg-config --static --libs-only-l $libs)
+CFLAGS += $(pkg-config "$@" --cflags scooper.pc)
+LDLIBS = $(pkg-config "$@" --libs scooper.pc)
 EOF
diff --git a/scooper.pc b/scooper.pc
new file mode 100644
index 0000000..1784b60
--- /dev/null
+++ b/scooper.pc
@@ -0,0 +1,7 @@
+Name: scooper
+Version:
+Description:
+URL:
+
+Requires: kcgi kcgi-html sqlite3
+Libs.private: -static