callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Look for gnomeConf.sh in $libdir, where the installation actually installs

Browse Source 
* gnome.m4 (GNOME_INIT): Look for gnomeConf.sh in $libdir, where
the installation actually installs it.

- Hari

svn path=/trunk/; revision=24
This commit is contained in:
Raja R Harinath 1998-02-13 21:03:03 +00:00
parent 797154c336
commit acdf11ced0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros/ChangeLog
View File

@ -1,5 +1,8 @@
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
* 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

19
macros/gnome.m4
View File

@ -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
])