Kyoshiro/bip
1
0
Fork 0
forked from bip/bip
Code Pull Requests Activity

automake/auotconf gory stuff

Browse Source
This commit is contained in:
nohar 2005-08-01 11:41:14 +00:00
parent 9c7eba2f6a
commit b4deba4b8c
5 changed files with 73 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Makefile.in
View File

@ -76,7 +76,8 @@ CONFIG_HEADER = ./src/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS TODO aclocal.m4 config.guess config.sub configure \ Makefile.in NEWS TODO aclocal.m4 config.guess config.sub configure \
configure.in install-sh missing mkinstalldirs configure.in install-sh missing mkinstalldirs src/config.h.in \
src/stamp-h.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@ -100,6 +101,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
src/config.h: src/stamp-h
@if test ! -f $@; then \
rm -f src/stamp-h; \
$(MAKE) src/stamp-h; \
else :; fi
src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=src/config.h \
$(SHELL) ./config.status
@echo timestamp > src/stamp-h 2> /dev/null
$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/src/stamp-h.in; \
$(MAKE) $(srcdir)/src/stamp-h.in; \
else :; fi
$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
mostlyclean-hdr:
clean-hdr:
distclean-hdr:
-rm -f src/config.h
maintainer-clean-hdr:
# This directory's subdirectories are mostly independent; you can cd # This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile. # into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles, # To change the values of `make' variables: instead of editing Makefiles,
@ -288,32 +317,32 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]* -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-recursive mostlyclean: mostlyclean-recursive
clean-am: clean-tags clean-generic mostlyclean-am clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
clean: clean-recursive clean: clean-recursive
distclean-am: distclean-tags distclean-generic clean-am distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
distclean: distclean-recursive distclean: distclean-recursive
-rm -f config.status -rm -f config.status
maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
distclean-am maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive maintainer-clean: maintainer-clean-recursive
-rm -f config.status -rm -f config.status
.PHONY: install-data-recursive uninstall-data-recursive \ .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
install-exec-recursive uninstall-exec-recursive installdirs-recursive \ install-data-recursive uninstall-data-recursive install-exec-recursive \
uninstalldirs-recursive all-recursive check-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
installcheck-recursive info-recursive dvi-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \
mostlyclean-recursive distclean-recursive clean-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \

42
aclocal.m4 vendored
View File

@ -10,13 +10,11 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE. dnl PARTICULAR PURPOSE.
# lib-prefix.m4 serial 3 (gettext-0.13) # lib-prefix.m4 serial 4 (gettext-0.14.2)
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software; the Free Software Foundation
dnl General Public License. As a special exception to the GNU General dnl gives unlimited permission to copy and/or distribute it,
dnl Public License, this file may be distributed as part of a program dnl with or without modifications, as long as this notice is preserved.
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible. dnl From Bruno Haible.
@ -83,7 +81,7 @@ AC_DEFUN([AC_LIB_PREFIX],
if test "X$additional_includedir" = "X/usr/local/include"; then if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
linux*) haveit=yes;; linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac esac
fi fi
fi fi
@ -166,16 +164,16 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
prefix="$acl_save_prefix" prefix="$acl_save_prefix"
]) ])
# lib-link.m4 serial 4 (gettext-0.12) # lib-link.m4 serial 6 (gettext-0.14.3)
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software; the Free Software Foundation
dnl General Public License. As a special exception to the GNU General dnl gives unlimited permission to copy and/or distribute it,
dnl Public License, this file may be distributed as part of a program dnl with or without modifications, as long as this notice is preserved.
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible. dnl From Bruno Haible.
AC_PREREQ(2.50)
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies. dnl the libraries corresponding to explicit and implicit dependencies.
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@ -263,6 +261,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
dnl hardcode_direct, hardcode_minus_L. dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH], AC_DEFUN([AC_LIB_RPATH],
[ [
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@ -518,7 +518,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
if test "X$additional_includedir" = "X/usr/local/include"; then if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
linux*) haveit=yes;; linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac esac
fi fi
fi fi
@ -567,7 +567,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
if test "X$additional_libdir" = "X/usr/local/lib"; then if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
linux*) haveit=yes;; linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac esac
fi fi
fi fi
@ -720,11 +720,9 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
# lib-ld.m4 serial 3 (gettext-0.13) # lib-ld.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software; the Free Software Foundation
dnl General Public License. As a special exception to the GNU General dnl gives unlimited permission to copy and/or distribute it,
dnl Public License, this file may be distributed as part of a program dnl with or without modifications, as long as this notice is preserved.
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl Subroutines of libtool.m4, dnl Subroutines of libtool.m4,
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision

4
configure vendored
View File

@ -2910,11 +2910,13 @@ fi
fi fi
CFLAGS=-O2 -g -W -Wall -Werror
debug=false debug=false
# Check whether --enable-debug or --disable-debug was given. # Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then if test "${enable_debug+set}" = set; then
enableval="$enable_debug" enableval="$enable_debug"
debug=true debug=true && CFLAGS="-O0 -g -W -Wall -Werror"
fi; fi;

4
configure.in
View File

@ -6,10 +6,12 @@ AC_PROG_INSTALL
AC_PROG_YACC AC_PROG_YACC
AM_PROG_LEX AM_PROG_LEX
CFLAGS=-O2 -g -W -Wall -Werror
debug=false debug=false
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
[ --enable-debug Turn on debugging], [ --enable-debug Turn on debugging],
[debug=true]) [debug=true && CFLAGS="-O0 -g -W -Wall -Werror"])
AM_CONDITIONAL(DEBUG, test x$debug = xtrue) AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
oidentd=false oidentd=false

7
src/lex.l
View File

@ -21,6 +21,13 @@ extern list_t *root_list;
void yyparse(void); void yyparse(void);
void free_conf(list_t*); void free_conf(list_t*);
/* SPANK ME WITH A SHOVEL */
static void yyunput(int c, char *buf);
void dummy_lex_FFS(void)
{
yyunput(0, NULL);
}
list_t *parse_conf(FILE *file) list_t *parse_conf(FILE *file)
{ {
YY_BUFFER_STATE in = yy_create_buffer(file, YY_BUF_SIZE); YY_BUFFER_STATE in = yy_create_buffer(file, YY_BUF_SIZE);