Merge branch 'automake'
Conflicts: configure.ac tests/examples/Makefile.am
This commit is contained in:
parent
69c6215277
commit
ed2427c653
2 changed files with 8 additions and 1 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -6,4 +6,10 @@
|
|||
.sconsign.dblite
|
||||
Buildhelper.pyc
|
||||
optcache
|
||||
|
||||
Makefile.in
|
||||
build/*
|
||||
autom4te.cache/*
|
||||
scripts/*
|
||||
configure
|
||||
aclocal.m4
|
||||
semantic.cache
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ AC_PROG_CC
|
|||
AC_PROG_CPP
|
||||
AC_PROG_CXX
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_RANLIB
|
||||
|
||||
#
|
||||
# test for headers
|
||||
|
|
|
|||
Loading…
Reference in a new issue