improve bootstrap

- set AC_CONFIG_AUX_DIR, so automake will not guess (wrongly)
- dont mention autogen in output
- AM_PROG_AR. required according to automake output (-Wall)
This commit is contained in:
Felix Salfelder 2015-09-30 20:32:47 +02:00
parent e02b163d2a
commit a4c1ce6786
3 changed files with 8 additions and 7 deletions

View File

@ -36,7 +36,7 @@ SUBDIRS = \
contrib \
$(RELEASEDIRS)
EXTRA_DIST = bootstrap depcomp PLATFORMS RELEASE Info.plist
EXTRA_DIST = ar-lib bootstrap depcomp PLATFORMS RELEASE Info.plist
# MacOSX specific installation of applications
if COND_MACOSX

View File

@ -22,18 +22,17 @@
# Boston, MA 02110-1301, USA.
#
here=`pwd`
cd `dirname $0`
echo -n "Creating aclocal.m4... "
${ACLOCAL:-aclocal} -I m4
echo "done."
echo -n "Creating config.h.in... "
autoheader
echo "done."
echo -n "Creating Makefile.in(s)... "
${AUTOMAKE:-automake} -a -f -c
echo -n "Running ${AUTOMAKE:-automake}... "
${AUTOMAKE:-automake} -a -f -c --gnu -Wall
echo "done."
echo -n "Creating configure... "
echo -n "Running autoconf... "
autoconf
echo "done."

View File

@ -9,11 +9,13 @@ m4_define([QUCS_VERSION], m4_esyscmd([tr -d '\n' < VERSION]))
AC_INIT([qucs], [QUCS_VERSION], [qucs-bugs@lists.sourceforge.net])
AC_CONFIG_SRCDIR([qucs/qucs.cpp])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([.])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([no-define])
AM_PROG_AR
AC_PREFIX_DEFAULT([/usr/local])
dnl Checks for programs.