From c125257a8e247c457fad09a29684f307712b3186 Mon Sep 17 00:00:00 2001 From: Raymond Li Date: Sun, 14 Feb 2021 17:16:19 -0500 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 26e322c..a281a74 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ i3lock tags *.swp *.gz -/pam/i3lock +*~ ################################################################################ # https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore @@ -31,4 +31,3 @@ Makefile.in /install-sh /missing /stamp-h1 -*.in~ From 32d2c24de3390f593d391f5b808283c5ea0c4f96 Mon Sep 17 00:00:00 2001 From: Raymond Li Date: Sun, 14 Feb 2021 17:18:24 -0500 Subject: [PATCH 2/4] Autoupdate configure --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7fa23a6..7c1a14e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Run autoreconf -fi to generate a configure script from this file. -AC_PREREQ([2.69]) -AC_INIT([i3lock-color], [m4_esyscmd_s([cat I3LOCK_VERSION])], [https://github.com/Raymo11/i3lock-color/issues]) +AC_PREREQ([2.70]) +AC_INIT([i3lock-color],[m4_esyscmd_s([cat I3LOCK_VERSION])],[https://github.com/Raymo11/i3lock-color/issues]) # For AX_EXTEND_SRCDIR AX_ENABLE_BUILDDIR 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. AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release]) -AC_PROG_CC_C99 +AC_REQUIRE(AC_PROG_CC) # For strnlen() and vasprintf(). AC_USE_SYSTEM_EXTENSIONS From 09c544a60036845c39f589da232116f1090badea Mon Sep 17 00:00:00 2001 From: Raymond Li Date: Sun, 14 Feb 2021 17:21:04 -0500 Subject: [PATCH 3/4] Fix configure --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7c1a14e..1a3e0ad 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ dnl is_release must be lowercase because AX_CHECK_ENABLE_DEBUG calls m4_tolower dnl on its fourth argument. AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release]) -AC_REQUIRE(AC_PROG_CC) +AC_PROG_CC # For strnlen() and vasprintf(). AC_USE_SYSTEM_EXTENSIONS From 21704224c010ad16a6cf08a774f46b5b1e6a37cc Mon Sep 17 00:00:00 2001 From: Raymond Li Date: Sun, 14 Feb 2021 17:27:45 -0500 Subject: [PATCH 4/4] 2.70 isn't available on ubuntu yet --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1a3e0ad..0fbc54b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Run autoreconf -fi to generate a configure script from this file. -AC_PREREQ([2.70]) +AC_PREREQ([2.69]) AC_INIT([i3lock-color],[m4_esyscmd_s([cat I3LOCK_VERSION])],[https://github.com/Raymo11/i3lock-color/issues]) # For AX_EXTEND_SRCDIR AX_ENABLE_BUILDDIR