Merge branch 'master' into pr/202

This commit is contained in:
Raymond Li 2021-02-14 17:28:48 -05:00
commit 3e1eb6ee4b
No known key found for this signature in database
GPG Key ID: A014EA89B62BBB1B
2 changed files with 3 additions and 4 deletions

3
.gitignore vendored
View File

@ -3,7 +3,7 @@ i3lock
tags tags
*.swp *.swp
*.gz *.gz
/pam/i3lock *~
################################################################################ ################################################################################
# https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore # https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore
@ -31,4 +31,3 @@ Makefile.in
/install-sh /install-sh
/missing /missing
/stamp-h1 /stamp-h1
*.in~

View File

@ -2,7 +2,7 @@
# Run autoreconf -fi to generate a configure script from this file. # Run autoreconf -fi to generate a configure script from this file.
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([i3lock-color], [m4_esyscmd_s([cat I3LOCK_VERSION])], [https://github.com/Raymo11/i3lock-color/issues]) AC_INIT([i3lock-color],[m4_esyscmd_s([cat I3LOCK_VERSION])],[https://github.com/Raymo11/i3lock-color/issues])
# For AX_EXTEND_SRCDIR # For AX_EXTEND_SRCDIR
AX_ENABLE_BUILDDIR AX_ENABLE_BUILDDIR
AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2]) AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
@ -50,7 +50,7 @@ dnl is_release must be lowercase because AX_CHECK_ENABLE_DEBUG calls m4_tolower
dnl on its fourth argument. dnl on its fourth argument.
AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release]) AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release])
AC_PROG_CC_C99 AC_PROG_CC
# For strnlen() and vasprintf(). # For strnlen() and vasprintf().
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS