|
From: Martin R. <ru...@us...> - 2005-01-23 15:02:43
|
Update of /cvsroot/foo/fooelk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6661 Modified Files: configure.ac Log Message: set default heapsize to 16M. added --with-motif switch for disabling motif extensions. switched --with-x and --with-motif defaults to no (speeds up build process) Index: configure.ac =================================================================== RCS file: /cvsroot/foo/fooelk/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.ac 25 Aug 2004 23:12:51 -0000 1.8 --- configure.ac 23 Jan 2005 15:02:33 -0000 1.9 *************** *** 519,524 **** # stop-and-copy garbage collector is used). AC_ARG_WITH(default-heapsize, ! AC_HELP_STRING([--with-default-heapsize=SIZE], [default heapsize of the interpreter for stop-and-copy garbage collector (4096k)]),, ! [with_default_heapsize=4096]) AC_DEFINE_UNQUOTED(HEAP_SIZE, ${with_default_heapsize}, [default heap size of the interpreter for stop-and-copy garbage collector]) --- 519,524 ---- # stop-and-copy garbage collector is used). AC_ARG_WITH(default-heapsize, ! AC_HELP_STRING([--with-default-heapsize=SIZE], [default heapsize of the interpreter for stop-and-copy garbage collector (16384k)]),, ! [with_default_heapsize=16384]) AC_DEFINE_UNQUOTED(HEAP_SIZE, ${with_default_heapsize}, [default heap size of the interpreter for stop-and-copy garbage collector]) *************** *** 575,578 **** --- 575,583 ---- AM_CONDITIONAL(HAVE_GDBM, test "${ac_cv_my_have_gdbm}" = "yes") + # in fooelk, we don't use x by default + if test "${with_x}" != yes; then + with_x=no + fi + AC_PATH_X *************** *** 619,632 **** AC_SUBST(XAW_LIBS) ! if test "${cross_compiling}" = "no"; then ! AC_CHECK_LIB(Xm, XmStringConcat, ! [ac_cv_my_have_motif=yes ! MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm" ! MOTIF_LIBS="-L${x_libraries} -lXm ${XT_LIBS}"], ! [ac_cv_my_have_motif=no], ! [[${XT_LIBS}]]) else ! ac_cv_my_have_motif="no (cross-compiling)" fi AM_CONDITIONAL(HAVE_MOTIF, test "${ac_cv_my_have_motif}" = "yes") AC_SUBST(MOTIF_CFLAGS) --- 624,648 ---- AC_SUBST(XAW_LIBS) ! # should we check for motif? ! AC_ARG_WITH(motif, ! AC_HELP_STRING([--with-motif], [build motif extensions (no)]), ! , ! [with_motif=no]) ! ! if test "${with_motif}" = "yes"; then ! if test "${cross_compiling}" = "no"; then ! AC_CHECK_LIB(Xm, XmStringConcat, ! [ac_cv_my_have_motif=yes ! MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm" ! MOTIF_LIBS="-L${x_libraries} -lXm ${XT_LIBS}"], ! [ac_cv_my_have_motif=no], ! [[${XT_LIBS}]]) ! else ! ac_cv_my_have_motif="no (cross-compiling)" ! fi else ! ac_cv_my_have_motif="no" fi + AM_CONDITIONAL(HAVE_MOTIF, test "${ac_cv_my_have_motif}" = "yes") AC_SUBST(MOTIF_CFLAGS) |