link libcgi only against rrd_cgi since it is only needed there -- Peter Breitenlohner

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@626 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/acinclude.m4 b/program/acinclude.m4
index 9e02d6d922ca24d65225018f111eacaad9acc766..8228d392f3d7a0da00bab86ec8c689faef302ecf 100644 (file)
--- a/program/acinclude.m4
+++ b/program/acinclude.m4
@@ -19,7 +19,7 @@ AC_DEFUN([EX_CHECK_ALL],
  EX_CHECK_STATE=NO
  ex_check_save_LIBS=${LIBS}
  ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDPFLAGS}
+ ex_check_save_LDFLAGS=${LDFLAGS}
  if test "x$7" != "x"; then
    CPPFLAGS="$CPPFLAGS -I$7"
  fi

diff --git a/program/configure.ac b/program/configure.ac
index 3ebfa156fc8b859336e5be919b45444851e4286d..0b1d5def3d5733a59b548440fed40ec3d0d2d7bb 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -230,14 +230,31 @@ AC_ARG_ENABLE(rrdcgi,[  --disable-rrdcgi        disable building of rrdcgi],
 [],[enable_rrdcgi=yes])
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
 
-if test $enable_rrdcgi != no; then
-EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib, "")
-fi
 EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
 EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.2,  http://www.gzip.org/zlib/, "")
 EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.8,  http://prdownloads.sourceforge.net/libpng/, "")
 EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,                    freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
 
+save_LIBS=${LIBS}
+save_CPPFLAGS=${CPPFLAGS}
+save_LDFLAGS=${LDFLAGS}
+
+if test $enable_rrdcgi != no; then
+EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib, "")
+fi
+
+CGI_LIBS=${LIBS}
+CGI_CPPFLAGS=${CPPFLAGS}
+CGI_LDFLAGS=${LDFLAGS}
+
+AC_SUBST(CGI_LIBS)
+AC_SUBST(CGI_CPPFLAGS)
+AC_SUBST(CGI_LDFLAGS)
+
+LIBS=${save_LIBS}
+CPPFLAGS=${save_CPPFLAGS}
+LDFLAGS=${save_LDFLAGS}
+
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
 fi

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index 77f48ca6b13986a3fd68e42170e1629f00e74e54..620529a024b9233c2c24bf1e49bbc67dcba80650 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/src/Makefile.am
@@ -115,6 +115,8 @@ endif
 
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD   = librrd.la
+rrdcgi_CPPFLAGS = $(AM_CPPFLAGS) @CGI_CPPFLAGS@
+rrdcgi_LDFLAGS = @CGI_LDFLAGS@ @CGI_LIBS@
 
 rrdupdate_SOURCES = 
 rrdupdate_LDADD        = rrdupdate.o librrd.la