diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2003-07-01 Dan Winship <danw@ximian.com> + + * configure.in: Check for gnome-icon-lookup.h (which could mean + either plain GNOME 2.2 or Sun GNOME 2.0) + 2003-06-30 Rodrigo Moya <rodrigo@ximian.com> * configure.in: diff --git a/configure.in b/configure.in index c21aadab15..c024cc3c5c 100644 --- a/configure.in +++ b/configure.in @@ -358,7 +358,7 @@ AC_CACHE_CHECK([for db3 library name], ac_cv_db3_ldadd, ac_cv_db3_ldadd="" for name in db db3 db-3.1; do - LIBS="$LIBS_save $with_db3_libs/lib${name}.a" + LIBS="$LIBS_save $with_db3_libs/lib${name}.a -lpthread" AC_TRY_LINK([ #ifdef HAVE_DB3_DB_H #include <db3/db.h> @@ -369,7 +369,7 @@ AC_CACHE_CHECK([for db3 library name], ac_cv_db3_ldadd, DB *db; db_create (&db, 0, 0); ], [ - ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a" + ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a -lpthread" break ]) done @@ -1058,6 +1058,11 @@ EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS) AC_SUBST(GNOME_FULL_CFLAGS) AC_SUBST(GNOME_FULL_LIBS) +CPPFLAGS_save="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`" +AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h) +CPPFLAGS="$CPPFLAGS_save" + dnl --- Flags for the various libraries we build EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.0 >= $GAL_REQUIRED $mozilla_nss, |