femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6 from KubaKaszycki/master

Browse source 
build: use more modern autotools features
This commit is contained in:
Sam Hocevar 2016-09-27 13:54:13 +02:00 committed by GitHub
commit 3eb9d58037
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -3,7 +3,6 @@ SUBDIRS = src tools fonts doc test
DIST_SUBDIRS = $(SUBDIRS) DIST_SUBDIRS = $(SUBDIRS)
EXTRA_DIST = bootstrap EXTRA_DIST = bootstrap
AUTOMAKE_OPTIONS = dist-bzip2
CACA2TLF = $(top_builddir)/tools/caca2tlf CACA2TLF = $(top_builddir)/tools/caca2tlf
FONTDIR = $(top_builddir)/fonts FONTDIR = $(top_builddir)/fonts

19
configure.ac
View file

@ -1,12 +1,12 @@
AC_INIT(toilet, 0.3) AC_INIT([toilet],[0.3])
AC_PREREQ(2.50) AC_PREREQ([2.69])
AC_CONFIG_SRCDIR(src/main.c) AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_AUX_DIR(.auto) AC_CONFIG_AUX_DIR(.auto)
AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(toilet, 0.3) AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_PROG_CC_C_O AM_PROG_CC_C_O
@ -28,12 +28,8 @@ AC_CHECK_HEADERS(sys/ioctl.h)
AC_CACHE_CHECK([for TIOCGWINSZ], AC_CACHE_CHECK([for TIOCGWINSZ],
[ac_cv_have_tiocgwinsz], [ac_cv_have_tiocgwinsz],
[AC_TRY_COMPILE( [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/ioctl.h>]], [[struct winsize ws;
[#include <sys/ioctl.h>], ioctl(1, TIOCGWINSZ, &ws);]])],[ac_cv_have_tiocgwinsz=yes],[ac_cv_have_tiocgwinsz=no])])
[struct winsize ws;
ioctl(1, TIOCGWINSZ, &ws);],
ac_cv_have_tiocgwinsz=yes,
ac_cv_have_tiocgwinsz=no)])
if test "${ac_cv_have_tiocgwinsz}" = "yes"; then if test "${ac_cv_have_tiocgwinsz}" = "yes"; then
AC_DEFINE(HAVE_TIOCGWINSZ, 1, [Define if you have TIOCGWINSZ]) AC_DEFINE(HAVE_TIOCGWINSZ, 1, [Define if you have TIOCGWINSZ])
fi fi
@ -54,7 +50,7 @@ CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
# Code qui fait des warnings == code de porc == deux baffes dans ta gueule # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare" CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
AC_OUTPUT([ AC_CONFIG_FILES([
Makefile Makefile
src/Makefile src/Makefile
tools/Makefile tools/Makefile
@ -62,4 +58,5 @@ AC_OUTPUT([
doc/Makefile doc/Makefile
test/Makefile test/Makefile
]) ])
AC_OUTPUT