diff options
| author | Nathan Fredrickson <nathan@silverorange.com> | 2005-02-28 00:31:04 +0000 |
|---|---|---|
| committer | Nathan Fredrickson <nathan@silverorange.com> | 2005-02-28 00:31:04 +0000 |
| commit | 802247f408f6b635d7fddbf3fdc5e4f2ba404a8f (patch) | |
| tree | c0da422cb669d6030a69efa2d4ee1cc25b315f77 /configure.ac | |
| parent | ea8eacf153500ab382bb264742d7ea720a4e5c76 (diff) | |
Make main_init() return a value.
Add missing prototype.
Add pkgconfig check for libsvg and libsvg-cairo.
Remove the hacky inclusion of libsvg-cairo.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e5aa5cb..4788a67 100644 --- a/configure.ac +++ b/configure.ac @@ -42,16 +42,16 @@ AC_SUBST(GNOME_LIBS) AC_SUBST(GNOME_CFLAGS) dnl ========= check for cairo ================================================== -dnl PKG_CHECK_MODULES(CAIRO, cairo libsvg-cairo,,exit) - -PKG_CHECK_MODULES(CAIRO, cairo > 0.2.0, - [AC_DEFINE([HAVE_NEWER_CAIRO], [1], [Newer Cairo])], - [PKG_CHECK_MODULES(CAIRO, cairo,,exit)] -) +PKG_CHECK_MODULES(CAIRO, cairo libsvg libsvg-cairo,,exit) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) +PKG_CHECK_MODULES(, cairo>0.2.0, + [AC_DEFINE([HAVE_CAIRO_0_2_0], [1], [Newer Cairo])], + continue +) + dnl ========= deprecated options =============================================== AC_ARG_ENABLE(deprecated, AC_HELP_STRING([--disable-deprecated], @@ -95,7 +95,7 @@ dnl MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \ dnl 's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'` dnl test embedded mysql - MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lmygcc -lsupc++" + MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lsupc++" AC_DEFINE([HAVE_MYSQL_EMBED], [1], [Have embedded MySQL]) AC_MSG_RESULT($MYSQL_LIBS) |