projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make dirent sys/types and sys/stat autoconfable ....
[rrdtool.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
c21395a
..
9c9fe25
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-137,11
+137,11
@@
char *strchr (), *strrchr ();
dnl Define library subdirectory names here.
dnl Define library subdirectory names here.
-CGI_LIB_DIR=
libraries/
cgilib-0.4
-FREETYPE_LIB_DIR=
libraries/
freetype-2.0.5
-ART_LIB_DIR=lib
raries/lib
art_lgpl-2.3.7
-PNG_LIB_DIR=lib
raries/lib
png-1.2.0
-ZLIB_LIB_DIR=
libraries/zlib-1.1.3
+CGI_LIB_DIR=cgilib-0.4
+FREETYPE_LIB_DIR=freetype-2.0.5
+ART_LIB_DIR=libart_lgpl-2.3.7
+PNG_LIB_DIR=libpng-1.2.0
+ZLIB_LIB_DIR=
zlib-1.1.4
dnl substitute them in all the files listed in AC_OUTPUT
AC_SUBST(CGI_LIB_DIR)
dnl substitute them in all the files listed in AC_OUTPUT
AC_SUBST(CGI_LIB_DIR)
@@
-151,6
+151,12
@@
AC_SUBST(FREETYPE_LIB_DIR)
AC_SUBST(ZLIB_LIB_DIR)
AC_SUBST(PERLFLAGS)
AC_SUBST(ZLIB_LIB_DIR)
AC_SUBST(PERLFLAGS)
+INCLUDED_LIB(cgi,cgiInit)
+INCLUDED_LIB(art_lgpl,art_vpath_add_point)
+INCLUDED_LIB(png,png_access_version_number)
+INCLUDED_LIB(freetype,FT_Init_FreeType)
+INCLUDED_LIB(z,zlibVersion)
+
dnl Check for Perl.
AC_PATH_PROG(PERL, perl, no)
if test "x$PERL" = "xno"; then
dnl Check for Perl.
AC_PATH_PROG(PERL, perl, no)
if test "x$PERL" = "xno"; then
@@
-224,7
+230,8
@@
AC_PROG_LIBTOOL
dnl Checks for header files.
AC_HEADER_STDC
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/time.h sys/times.h sys/param.h sys/resource.h float.h)
+AC_HEADER_DIRENT
+AC_CHECK_HEADERS(sys/stat.h sys/types.h fcntl.h time.h locale.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/time.h sys/times.h sys/param.h sys/resource.h float.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@
-272,7
+279,7
@@
AC_FUNC_VPRINTF
dnl for each function found we get a definition in config.h
dnl of the form HAVE_FUNCTION
dnl for each function found we get a definition in config.h
dnl of the form HAVE_FUNCTION
-AC_CHECK_FUNCS(strerror snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday)
+AC_CHECK_FUNCS(
tzset setlocale
strerror snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday)
dnl HP-UX 11.00 does not have finite but does have isfinite as a macro
AC_CHECK_FUNCS(fpclassify, ,
dnl HP-UX 11.00 does not have finite but does have isfinite as a macro
AC_CHECK_FUNCS(fpclassify, ,
@@
-439,8
+446,9
@@
AC_CONFIG_FILES([examples/shared-demo.pl \
libraries/cgilib-0.4/Makefile \
libraries/libart_lgpl-2.3.7/Makefile \
libraries/libpng-1.2.0/Makefile \
libraries/cgilib-0.4/Makefile \
libraries/libart_lgpl-2.3.7/Makefile \
libraries/libpng-1.2.0/Makefile \
- libraries/zlib-1.1.
3
/Makefile \
+ libraries/zlib-1.1.
4
/Makefile \
libraries/freetype-2.0.5/Makefile \
libraries/freetype-2.0.5/Makefile \
+ libraries/afm/Makefile \
src/Makefile \
bindings/Makefile \
bindings/tcl/Makefile \
src/Makefile \
bindings/Makefile \
bindings/tcl/Makefile \
@@
-452,7
+460,7
@@
AC_OUTPUT
AC_MSG_CHECKING(in)
AC_MSG_RESULT(and out again)
AC_MSG_CHECKING(in)
AC_MSG_RESULT(and out again)
-echo $ECHO_N "ordering CD from http://
ee-staff
.ethz.ch/~oetiker/wish $ECHO_C" 1>&6
+echo $ECHO_N "ordering CD from http://
people.ee
.ethz.ch/~oetiker/wish $ECHO_C" 1>&6
sleep 1
echo $ECHO_N ".$ECHO_C" 1>&6
sleep 1
sleep 1
echo $ECHO_N ".$ECHO_C" 1>&6
sleep 1
@@
-474,7
+482,7
@@
echo "If you want to install the perl"
echo "modules in site-perl, try 'make site-perl-install'."
echo
echo " ... that wishlist is NO JOKE. If you find RRDtool useful"
echo "modules in site-perl, try 'make site-perl-install'."
echo
echo " ... that wishlist is NO JOKE. If you find RRDtool useful"
-echo "make me happy. Go to http://
ee-staff
.ethz.ch/~oetiker/wish and"
+echo "make me happy. Go to http://
people.ee
.ethz.ch/~oetiker/wish and"
echo "place an order."
echo
echo " -- Tobi Oetiker <tobi@oetiker.ch>"
echo "place an order."
echo
echo " -- Tobi Oetiker <tobi@oetiker.ch>"