Skip to content

Commit

Permalink
Added Macro headers
Browse files Browse the repository at this point in the history
macro headers provided in config.h was not being build and the file was
ignored by autotools. Fixes that by adding it to configure.ac

Signed-off-by: Abishek V ashok <[email protected]>
  • Loading branch information
abishekvashok committed Jun 23, 2017
1 parent 476808f commit 214004f
Show file tree
Hide file tree
Showing 6 changed files with 374 additions and 63 deletions.
57 changes: 38 additions & 19 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = cmatrix.spec
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
Expand Down Expand Up @@ -169,7 +170,8 @@ am__uninstall_files_from_dir = { \
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
Expand All @@ -191,8 +193,9 @@ CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/cmatrix.spec.in \
AUTHORS COPYING ChangeLog INSTALL NEWS README acconfig.h \
compile depcomp install-sh missing mkinstalldirs
$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
README acconfig.h compile depcomp install-sh missing \
mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Expand Down Expand Up @@ -308,7 +311,8 @@ EXTRA_DIST = COPYING INSTALL install-sh\
missing mkinstalldirs matrix.fnt \
matrix.psf.gz mtx.pcf cmatrix.1 cmatrix.spec

all: all-am
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am

.SUFFIXES:
.SUFFIXES: .c .o .obj
Expand Down Expand Up @@ -345,6 +349,21 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):

config.h: stamp-h1
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1

stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@

distclean-hdr:
-rm -f config.h stamp-h1
cmatrix.spec: $(top_builddir)/config.status $(srcdir)/cmatrix.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-binPROGRAMS: $(bin_PROGRAMS)
Expand Down Expand Up @@ -683,7 +702,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
all-am: Makefile $(PROGRAMS) $(MANS) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Expand Down Expand Up @@ -727,7 +746,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
distclean-hdr distclean-tags

dvi: dvi-am

Expand Down Expand Up @@ -792,25 +811,25 @@ uninstall-am: uninstall-binPROGRAMS uninstall-man

uninstall-man: uninstall-man1

.MAKE: install-am install-strip
.MAKE: all install-am install-strip

.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-cscope clean-generic cscope \
cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-compile distclean-generic \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-man1 install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-man \
uninstall-man1
distclean-hdr distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-data-local install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-man uninstall-man1

.PRECIOUS: Makefile

Expand Down
29 changes: 29 additions & 0 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,35 @@ else
fi
])

# -*- Autoconf -*-
# Obsolete and "removed" macros, that must however still report explicit
# error messages when used, to smooth transition.
#
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

AC_DEFUN([AM_CONFIG_HEADER],
[AC_DIAGNOSE([obsolete],
['$0': this macro is obsolete.
You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
AC_CONFIG_HEADERS($@)])

AC_DEFUN([AM_PROG_CC_STDC],
[AC_PROG_CC
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
AC_DIAGNOSE([obsolete],
['$0': this macro is obsolete.
You should simply use the 'AC][_PROG_CC' macro instead.
Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
but upon 'ac_cv_prog_cc_stdc'.])])

AC_DEFUN([AM_C_PROTOTYPES],
[AC_FATAL([automatic de-ANSI-fication support has been removed])])
AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])

# Helper functions for option handling. -*- Autoconf -*-

# Copyright (C) 2001-2014 Free Software Foundation, Inc.
Expand Down
6 changes: 3 additions & 3 deletions cmatrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int va_system(char *str, ...) {
}

/* What we do when we're all set to exit */
RETSIGTYPE finish(int sigage) {
void finish(int sigage) {
curs_set(1);
clear();
refresh();
Expand All @@ -101,7 +101,7 @@ RETSIGTYPE finish(int sigage) {
}

/* What we do when we're all set to exit */
RETSIGTYPE c_die(char *msg, ...) {
void c_die(char *msg, ...) {

va_list ap;

Expand Down Expand Up @@ -162,7 +162,7 @@ void *nmalloc(size_t howmuch) {
}

/* Initialize the global variables */
RETSIGTYPE var_init(void) {
void var_init(void) {
int i, j;

if (matrix != NULL) {
Expand Down
110 changes: 110 additions & 0 deletions config.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define this if your curses library has use_default_colors, for
cool transparency =-) */
#undef HAVE_USE_DEFAULT_COLORS

/* Define this if you have the linux consolechars program */
#undef HAVE_CONSOLECHARS

/* Define this if you have the linux setfont program */
#undef HAVE_SETFONT

/* Define this if you have the wresize function in your ncurses-type library */
#undef HAVE_WRESIZE

/* Define this if you have the resizeterm function in your ncurses-type library */
#undef HAVE_RESIZETERM


/* Define to 1 if you have the <curses.h> header file. */
#undef HAVE_CURSES_H

/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H

/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `ncurses' library (-lncurses). */
#undef HAVE_LIBNCURSES

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H

/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV

/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H

/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H

/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H

/* Define to 1 if you have the <termio.h> header file. */
#undef HAVE_TERMIO_H

/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

/* Define to 1 if you have the file `/usr/lib/kbd/consolefonts'. */
#undef HAVE__USR_LIB_KBD_CONSOLEFONTS

/* Define to 1 if you have the file `/usr/lib/X11/fonts/misc'. */
#undef HAVE__USR_LIB_X11_FONTS_MISC

/* Define to 1 if you have the file `/usr/share/consolefonts'. */
#undef HAVE__USR_SHARE_CONSOLEFONTS

/* Define to 1 if you have the file `/usr/X11R6/lib/X11/fonts/misc'. */
#undef HAVE__USR_X11R6_LIB_X11_FONTS_MISC

/* Name of package */
#undef PACKAGE

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

/* Define to the full name of this package. */
#undef PACKAGE_NAME

/* Define to the full name and version of this package. */
#undef PACKAGE_STRING

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the home page for this package. */
#undef PACKAGE_URL

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE

/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

/* Version number of package */
#undef VERSION
Loading

0 comments on commit 214004f

Please sign in to comment.