Skip to content

Commit

Permalink
Move Arch check to configure.ac
Browse files Browse the repository at this point in the history
  • Loading branch information
Raymo111 committed Aug 5, 2020
1 parent 02334d3 commit e3ffaba
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e3ffaba

Please sign in to comment.