From 8da3f3c38e075498a24fb9db80ae9862bda7154d Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 9 Dec 2014 01:21:48 +0000 Subject: Do not use yywrap (ticket #42) Our scanners do not really use yywrap. Explicitly disable yywrap so that no references to yywrap will be generated and no LEXLIB would be needed. * conf/pam_conv1/Makefile.am (pam_conv1_LDADD): Remove. * conf/pam_conv1/pam_conv_l.l: Enable noyywrap option. * doc/specs/Makefile.am (padout_LDADD): Remove. * doc/specs/parse_l.l: Enable noyywrap option. --- doc/specs/Makefile.am | 2 -- doc/specs/parse_l.l | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'doc/specs') diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am index 26882207..36d53baf 100644 --- a/doc/specs/Makefile.am +++ b/doc/specs/Makefile.am @@ -21,6 +21,4 @@ noinst_PROGRAMS = padout padout_SOURCES = parse_l.l parse_y.y -padout_LDADD = @LEXLIB@ - doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt diff --git a/doc/specs/parse_l.l b/doc/specs/parse_l.l index 7cab424c..d8400a07 100644 --- a/doc/specs/parse_l.l +++ b/doc/specs/parse_l.l @@ -8,6 +8,7 @@ #include "parse_y.h" %} +%option noyywrap %% \#[\$]+[a-zA-Z]*(\=[0-9]+)? return NEW_COUNTER; -- cgit v1.2.3 From 9d1545efee73ec834b051c50a1bc0d2a63d8765b Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 9 Dec 2014 21:47:40 +0000 Subject: build: extend cross compiling check to cover CPPFLAGS (ticket #21) Use BUILD_CPPFLAGS variable to override CPPFLAGS where necessary in case of cross compiling, in addition to CC_FOR_BUILD, BUILD_CFLAGS, and BUILD_LDFLAGS variables introduced earlier to override CC, CFLAGS, and LDFLAGS, respectively. * configure.in (BUILD_CPPFLAGS): Define. * doc/specs/Makefile.am (CPPFLAGS): Define to @BUILD_CPPFLAGS@. --- configure.in | 9 +++++++++ doc/specs/Makefile.am | 1 + 2 files changed, 10 insertions(+) (limited to 'doc/specs') diff --git a/configure.in b/configure.in index 2597802f..6797e2fe 100644 --- a/configure.in +++ b/configure.in @@ -144,6 +144,15 @@ AC_MSG_CHECKING([for CC_FOR_BUILD]) AC_MSG_RESULT([$CC_FOR_BUILD]) AC_SUBST(CC_FOR_BUILD) +if test "x${BUILD_CPPFLAGS+set}" != "xset" ; then + if test "x$cross_compiling" = "xyes" ; then + BUILD_CPPFLAGS= + else + BUILD_CPPFLAGS=${CPPFLAGS} + fi +fi +AC_SUBST(BUILD_CPPFLAGS) + if test "x${BUILD_CFLAGS+set}" != "xset" ; then if test "x$cross_compiling" = "xyes" ; then BUILD_CFLAGS= diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am index 36d53baf..99ecc70e 100644 --- a/doc/specs/Makefile.am +++ b/doc/specs/Makefile.am @@ -12,6 +12,7 @@ draft-morgan-pam-current.txt: padout draft-morgan-pam.raw AM_YFLAGS = -d CC = @CC_FOR_BUILD@ +CPPFLAGS = @BUILD_CPPFLAGS@ CFLAGS = @BUILD_CFLAGS@ LDFLAGS = @BUILD_LDFLAGS@ -- cgit v1.2.3