1
0
Fork 0
mirror of https://github.com/Raymo111/i3lock-color.git synced 2025-02-17 15:55:52 -05:00

Move Arch check to configure.ac

This commit is contained in:
Raymond Li 2020-08-04 22:32:22 -04:00
parent 02334d35ae
commit e3ffaba058
3 changed files with 8 additions and 6 deletions

View file

@ -61,13 +61,14 @@ The following dependencies will need to be installed for a successful build, dep
### Ubuntu 18.04 LTS ### Ubuntu 18.04 LTS
Run this command to install all dependencies: 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 ## Arch Linux
- autoconf - autoconf
- cairo - cairo
- fontconfig - fontconfig
- gcc
- libev - libev
- libjpeg-turbo - libjpeg-turbo
- libxinerama - libxinerama

View file

@ -1,11 +1,6 @@
#!/bin/bash #!/bin/bash
autoreconf -fiv 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/ BUILD_DIR=build/
rm -rf $BUILD_DIR rm -rf $BUILD_DIR
mkdir -vp $BUILD_DIR mkdir -vp $BUILD_DIR

View file

@ -87,6 +87,12 @@ case "$host" in
;; ;;
esac 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])]) 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 dnl Each prefix corresponds to a source tarball which users might have