commit e3ffaba058186e4e83a8e4122f58f220bfbe4bc0
parent 02334d35ae279b67a50ba55af612d01c68095f34
Author: Raymond Li <hi@raymond.li>
Date: Tue, 4 Aug 2020 22:32:22 -0400
Move Arch check to configure.ac
Diffstat:
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -61,13 +61,14 @@ The following dependencies will need to be installed for a successful build, dep
### Ubuntu 18.04 LTS
Run this command to install all dependencies:
```
-sudo apt install pkg-config libpam0g-dev libcairo2-dev libfontconfig1-dev libxcb-composite0-dev libev-dev libx11-xcb-dev libxcb-xkb-dev libxcb-xinerama0-dev libxcb-randr0-dev libxcb-image0-dev libxcb-util-dev libxcb-xrm-dev libxkbcommon-dev libxkbcommon-x11-dev libjpeg-dev
+sudo apt install autoconf gcc make pkg-config libpam0g-dev libcairo2-dev libfontconfig1-dev libxcb-composite0-dev libev-dev libx11-xcb-dev libxcb-xkb-dev libxcb-xinerama0-dev libxcb-randr0-dev libxcb-image0-dev libxcb-util-dev libxcb-xrm-dev libxkbcommon-dev libxkbcommon-x11-dev libjpeg-dev
```
## Arch Linux
- autoconf
- cairo
- fontconfig
+- gcc
- libev
- libjpeg-turbo
- libxinerama
diff --git a/build.sh b/build.sh
@@ -1,11 +1,6 @@
#!/bin/bash
autoreconf -fiv
-if [[ -f /etc/arch-release ]]; then
- sed -i "s/^#auth include system-auth/auth include system-auth/g" pam/i3lock
- sed -i "s/^auth include login/#auth include login/g" pam/i3lock
-fi
-
BUILD_DIR=build/
rm -rf $BUILD_DIR
mkdir -vp $BUILD_DIR
diff --git a/configure.ac b/configure.ac
@@ -87,6 +87,12 @@ case "$host" in
;;
esac
+# Use system-auth instead of login on Arch (TODO: Implement Gentoo as well)
+if [[ -f /etc/arch-release ]]; then
+ sed -i "s/^#auth include system-auth/auth include system-auth/g" pam/i3lock
+ sed -i "s/^auth include login/#auth include login/g" pam/i3lock
+fi
+
AC_SEARCH_LIBS([iconv_open], [iconv], , [AC_MSG_FAILURE([cannot find the required iconv_open() function despite trying to link with -liconv])])
dnl Each prefix corresponds to a source tarball which users might have
