From f521595158abfc1e5aa63aae3a721290289eaa8f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 6 Nov 2000 21:24:29 +0000 Subject: ${prefix} doesn't get defaulted until the end of configure, so check if * configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted until the end of configure, so check if it's "NONE" and use ${ac_default_prefix} if so. svn path=/trunk/; revision=6426 --- ChangeLog | 6 ++++++ configure.in | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2594b72f6..bd44e8882b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-11-06 Dan Winship + + * configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted + until the end of configure, so check if it's "NONE" and use + ${ac_default_prefix} if so. + 2000-11-06 Radek Doulik * configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in diff --git a/configure.in b/configure.in index 5ad702ca3b..0a0418b3ca 100644 --- a/configure.in +++ b/configure.in @@ -351,13 +351,18 @@ GTKHTML_LIBS="`gnome-config --libs gtkhtml`" AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) -AC_MSG_CHECKING(for HTMLEditor.idl in `gnome-config --datadir`/gtkhtml or ${prefix}/share/gtkhtml) +if test x${prefix} = xNONE; then + html_prefix=$ac_default_prefix +else + html_prefix=$prefix +fi +AC_MSG_CHECKING(for HTMLEditor.idl in `gnome-config --datadir`/gtkhtml or ${html_prefix}/share/gtkhtml) if test -f `gnome-config --datadir`/gtkhtml/HTMLEditor.idl; then GTK_HTML_EDITOR_IDL=`gnome-config --datadir`/gtkhtml/HTMLEditor.idl AC_MSG_RESULT(found) else - if test -f ${prefix}/share/gtkhtml/HTMLEditor.idl; then - GTK_HTML_EDITOR_IDL=${prefix}/share/gtkhtml/HTMLEditor.idl + if test -f ${html_prefix}/share/gtkhtml/HTMLEditor.idl; then + GTK_HTML_EDITOR_IDL=${html_prefix}/share/gtkhtml/HTMLEditor.idl AC_MSG_RESULT(found) else AC_MSG_ERROR(HTMLEditor.idl is required to compile Evolution composer, it's included in GtkHTML -- cgit v1.2.3