diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2004-11-09 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + + Fix check for nsIPassword.h header to look in the right place. + Fixes bug #157743. + +2004-11-09 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-history-window.c: (add_by_date_filter): Simplified the code a bit. diff --git a/configure.ac b/configure.ac index a458de625..3e9a5d57c 100644 --- a/configure.ac +++ b/configure.ac @@ -381,9 +381,15 @@ AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/pipnss/nsIX509Cert.h], [AC_DEFINE(HAVE_MOZILLA_PSM, 1, [Define if you have the mozilla psm headers installed])]) -AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h], - [AC_DEFINE(HAVE_NSIPASSWORD_H, 1, - [Define if mozilla nsIPassword header is available])]) +if test "x$flavour" = "xmozilla"; then + AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h], + [AC_DEFINE(HAVE_NSIPASSWORD_H, 1, + [Define if mozilla nsIPassword header is available])]) +elif test "x$flavour" = "xtoolkit"; then + AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/passwordmgr/nsIPassword.h], + [AC_DEFINE(HAVE_NSIPASSWORD_H, 1, + [Define if mozilla nsIPassword header is available])]) +fi MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" AC_SUBST([MOZILLA_WARN_CXXFLAGS]) |