diff options
| -rw-r--r-- | macros/gnome.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/macros/gnome.m4 b/macros/gnome.m4 index 112211b7db..b0dccf7a86 100644 --- a/macros/gnome.m4 +++ b/macros/gnome.m4 @@ -14,7 +14,12 @@ AC_DEFUN([GNOME_INIT], AC_SUBST(GNOMELIB_DIR) AC_SUBST(GNOMEINCLUDE_DIR) - gnome_prefix=$prefix/lib + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + AC_ARG_WITH(gnome-includes, [--with-gnome-includes Specify location of GNOME headers],[ CFLAGS="$CFLAGS -I$withval" @@ -34,11 +39,12 @@ AC_DEFUN([GNOME_INIT], ]) - AC_MSG_CHECKING(Loading gnomeConf.sh values) + AC_MSG_CHECKING(for gnomeConf.sh file) if test -e $gnome_prefix/gnomeConf.sh; then - . $gnome_prefix/gnomeConf.sh AC_MSG_RESULT(found) + echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh else AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) fi -])
\ No newline at end of file +]) |