aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>1998-02-14 03:16:00 +0800
committerArturo Espinosa <unammx@src.gnome.org>1998-02-14 03:16:00 +0800
commite1a1dbefbb641261e75e0698a059a73feed17bcf (patch)
treed65d4ed612cefb38a89df3663b94c492b22a24fe
parent29978a207d94bf463d65e0a330214469fdb41ce5 (diff)
downloadgsoc2013-evolution-e1a1dbefbb641261e75e0698a059a73feed17bcf.tar.gz
gsoc2013-evolution-e1a1dbefbb641261e75e0698a059a73feed17bcf.tar.zst
gsoc2013-evolution-e1a1dbefbb641261e75e0698a059a73feed17bcf.zip
Gary Vaughan's fixes to gnome.m4
svn path=/trunk/; revision=22
-rw-r--r--macros/gnome.m414
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
+])