Update of /cvsroot/compbench/CompBenchmarks++
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6985
Modified Files:
configure.in
Log Message:
libxml2 and Gtk2 Perl module checked.
Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure.in 25 Jan 2007 20:40:15 -0000 1.23
--- configure.in 26 Jan 2007 01:26:04 -0000 1.24
***************
*** 37,41 ****
# AC_DEFINE_DIR([CBM_DATADIR], [$datadir], [Data directory])
! CPPFLAGS = -DDATAROOTDIR='"$(datarootdir)"' @CPPFLAGS@
AC_PATH_PROG(CBM_PROG_DIALOG, dialog, [],
--- 37,41 ----
# AC_DEFINE_DIR([CBM_DATADIR], [$datadir], [Data directory])
! CPPFLAGS=-DDATAROOTDIR='"$(datarootdir)"' $CPPFLAGS
AC_PATH_PROG(CBM_PROG_DIALOG, dialog, [],
***************
*** 203,211 ****
fi
CXXFLAGS="-Wall -pedantic -O2 -g"
# Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
!
# Checks for header files.
AC_HEADER_STDC
--- 203,224 ----
fi
+ AC_MSG_CHECKING([Perl's Gtk2 module])
+ `$CBM_PROG_PERL -e 'use Gtk2' 2> /dev/null`
+ if test $? = 0; then
+ AC_MSG_RESULT([yes])
+ AM_CONDITIONAL(CBM_GTK2, test "1" = "1")
+ CBM_GTK2="enabled"
+ else
+ AC_MSG_RESULT([no, gtk interface disabled.])
+ AC_DEFINE_UNQUOTED(CBM_GTK2, 0, [Gtk2])
+ AM_CONDITIONAL(CBM_GTK2, test "0" = "1")
+ CBM_GTK2="disabled"
+ fi
+
CXXFLAGS="-Wall -pedantic -O2 -g"
# Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
! AM_PATH_XML2(2.6.16,,exit 1)
# Checks for header files.
AC_HEADER_STDC
***************
*** 254,257 ****
--- 267,272 ----
AC_SUBST(CBM_PROG_PERL)
AC_SUBST(CXXFLAGS)
+ AC_SUBST(XML_CPPFLAGS)
+ AC_SUBST(XML_LIBS)
AC_OUTPUT(libcompbenchmarks/share/Makefile
***************
*** 279,282 ****
--- 294,301 ----
echo "CXX : $CXX"
echo "CXFLAGS : $CXXFLAGS"
+ echo "XML_LIBS : $XML_LIBS"
+ echo "XML_CPPFLAGS : $XML_CPPFLAGS"
+ echo ""
echo "System : $CBM_SYSTEM"
+ echo "Gtk2 frontend : $CBM_GTK2"
echo ""
|