From: chas w. <ch...@us...> - 2009-08-03 20:37:07
|
Update of /cvsroot/linux-atm/linux-atm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4419 Modified Files: Tag: V2_5_1 configure.in Log Message: in order to make cross compling more sane and easier to follow, we split qgen (which is the only program that needs to be built and run on the host system) into qgen and q2931. so qgen now contains only host system binaries and as such doesnt need HAVE_CONFIG_H since that is really meant for the target system. also added the CFLAGS_FOR_BUILD flag that overrides CFLAGS in src/qgen. automake complains about this but i dont see a better way really unless i rewrite COMPILE. Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.12.2.1 retrieving revision 1.2.2.12.2.2 diff -C2 -d -r1.2.2.12.2.1 -r1.2.2.12.2.2 *** configure.in 3 Aug 2009 15:15:24 -0000 1.2.2.12.2.1 --- configure.in 3 Aug 2009 20:36:56 -0000 1.2.2.12.2.2 *************** *** 26,37 **** AC_PROG_YACC AC_PROG_INSTALL - if test "x$cross_compiling" = "xyes"; then - AC_MSG_CHECKING(cc for build) - AC_CHECK_PROGS(CC_FOR_BUILD, gcc) - AC_MSG_RESULT($CC_FOR_BUILD) - else - CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" - fi - AC_SUBST(CC_FOR_BUILD) dnl libtool defs --- 26,29 ---- *************** *** 64,67 **** --- 56,70 ---- INCLUDES="-I\$(top_srcdir)/src/include" CFLAGS="$INCLUDES $CFLAGS -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes" + if test "x$cross_compiling" = "xyes"; then + AC_MSG_CHECKING(cc for build) + AC_CHECK_PROGS(CC_FOR_BUILD, gcc) + AC_MSG_RESULT($CC_FOR_BUILD) + CFLAGS_FOR_BUILD="$INCLUDES $CFLAGS_FOR_BUILD -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes" + else + CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-$CFLAGS}" + fi + AC_SUBST(CC_FOR_BUILD) + AC_SUBST(CFLAGS_FOR_BUILD) dnl Add -d flag to bison/yacc to create intermediate .h files YACC="$YACC -d" *************** *** 215,218 **** --- 218,222 ---- src/qgen/Makefile \ src/saal/Makefile \ + src/q2931/Makefile \ src/sigd/Makefile \ src/maint/Makefile \ |