From: tecodev Date: Sun, 10 Aug 2008 22:03:04 +0000 (+0000) Subject: * configure.in, X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=254890d9630b04b32fbf4e0848f3129a1a33481d;p=fw%2Fsdcc * configure.in, * Makefile.common.in: export PACKAGE for $docdir, fixes #1957036, avoid some "underquoted definition" warnings * configure: regenerated git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5211 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index d014e775..f8f58ff7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-10 Raphael Neider + + * configure.in, + * Makefile.common.in: export PACKAGE for $docdir, + fixes #1957036, avoid some "underquoted definition" warnings + * configure: regenerated + 2008-08-10 Raphael Neider * device/lib/pic16/**: build pic16 library using autotools for diff --git a/Makefile.common.in b/Makefile.common.in index cd285a4e..0a540bf4 100644 --- a/Makefile.common.in +++ b/Makefile.common.in @@ -3,6 +3,7 @@ # # Version +PACKAGE = @PACKAGE@ VERSION = @VERSION@ VERSIONHI = @VERSIONHI@ VERSIONLO = @VERSIONLO@ @@ -15,7 +16,7 @@ CPP = @CPP@ RANLIB = @RANLIB@ INSTALL = @INSTALL@ YACC = @YACC@ -LEX = @LEX@ +LEX = @LEX@ AWK = @AWK@ STRIP = @STRIP@ prefix = @prefix@ diff --git a/configure b/configure index 3ca266fe..16a453ca 100755 --- a/configure +++ b/configure @@ -652,6 +652,7 @@ build_alias host_alias target_alias AWK +PACKAGE VERSION VERSIONHI VERSIONLO @@ -1823,6 +1824,8 @@ VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'` { echo "$as_me:$LINENO: result: ${VERSION}" >&5 echo "${ECHO_T}${VERSION}" >&6; } +PACKAGE=sdcc + @@ -8358,6 +8361,7 @@ build_alias!$build_alias$ac_delim host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim AWK!$AWK$ac_delim +PACKAGE!$PACKAGE$ac_delim VERSION!$VERSION$ac_delim VERSIONHI!$VERSIONHI$ac_delim VERSIONLO!$VERSIONLO$ac_delim @@ -8413,7 +8417,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index fb1485f5..579f6a7a 100644 --- a/configure.in +++ b/configure.in @@ -23,6 +23,7 @@ VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'` VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'` AC_MSG_RESULT(${VERSION}) +AC_SUBST(PACKAGE, [sdcc]) AC_SUBST(VERSION) AC_SUBST(VERSIONHI) AC_SUBST(VERSIONLO) @@ -56,7 +57,7 @@ AC_CHECK_PROGS(LEX, flex lex, :) dnl Don't use AC_PROG_YACC AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc, :) -AC_DEFUN(SDCC_REQUIRE_PROG, +AC_DEFUN([SDCC_REQUIRE_PROG], [if test "$1" = ":"; then AC_MSG_ERROR([Cannot find required program $2.]) fi @@ -81,7 +82,7 @@ AC_CHECK_FUNCS(vsnprintf snprintf vsprintf mkstemp) # supports option specified as the 2nd parameter # For example: DD_CPORT(CXX, fPIC) -AC_DEFUN(adl_DD_COPT, [ +AC_DEFUN([adl_DD_COPT], [ AC_CACHE_CHECK(whether $$1 accepts -$2,sdcc_cv_$1$2, cat >_test_.c <