From acdf11ced0111755082a56eb29919c2bd778ded4 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Fri, 13 Feb 1998 21:03:03 +0000 Subject: Look for gnomeConf.sh in $libdir, where the installation actually installs * gnome.m4 (GNOME_INIT): Look for gnomeConf.sh in $libdir, where the installation actually installs it. - Hari svn path=/trunk/; revision=24 --- macros/ChangeLog | 3 +++ macros/gnome.m4 | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'macros') diff --git a/macros/ChangeLog b/macros/ChangeLog index 2b163e2ff5..67138ceb35 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,5 +1,8 @@ 1998-02-13 Raja R Harinath + * gnome.m4 (GNOME_INIT): Look for gnomeConf.sh in $libdir, where + the installation actually installs it. + * Makefile.am (macros.dep): New maintainer rule for handling automatic rebuilding of aclocal.m4 if any of the macros change. (MACROS): New variable. List of all `m4' macros in this diff --git a/macros/gnome.m4 b/macros/gnome.m4 index b0dccf7a86..f3fae839ee 100644 --- a/macros/gnome.m4 +++ b/macros/gnome.m4 @@ -11,13 +11,17 @@ AC_DEFUN([GNOME_INIT], AC_SUBST(GNOME_LIBS) AC_SUBST(GNOMEUI_LIBS) AC_SUBST(GTKXMHTML_LIBS) - AC_SUBST(GNOMELIB_DIR) - AC_SUBST(GNOMEINCLUDE_DIR) + AC_SUBST(GNOME_LIBDIR) + AC_SUBST(GNOME_INCLUDEDIR) - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi else - gnome_prefix=$prefix/lib + gnome_prefix=`eval echo \`echo $libdir\`` fi AC_ARG_WITH(gnome-includes, @@ -39,12 +43,13 @@ AC_DEFUN([GNOME_INIT], ]) - AC_MSG_CHECKING(for gnomeConf.sh file) - if test -e $gnome_prefix/gnomeConf.sh; then + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) + if test -f $gnome_prefix/gnomeConf.sh; then AC_MSG_RESULT(found) echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh" . $gnome_prefix/gnomeConf.sh else + AC_MSG_RESULT(not found) AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) fi ]) -- cgit v1.2.3