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

Weee! gmc uses the gnome.m4 macros now and detects properly gnome installation - mig

Browse Source 
svn path=/trunk/; revision=72
This commit is contained in:
Arturo Espinosa
1998-03-20 02:54:16 +00:00
parent 15549badbe
commit 1c388d9817
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
macros/ChangeLog
View File

@ -1,3 +1,10 @@
1998-03-19 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gnome.m4 (GNOME_INIT_HOOK): Provide a way to hook some code to
execute; Accept a probe mode.
(GNOME_INIT): Define in terms of GNOME_INIT_HOOK.
Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com>
* gnome-support.m4: Cache results of check for

28
macros/gnome.m4
View File

@ -1,4 +1,11 @@
AC_DEFUN([GNOME_INIT],
dnl
dnl GNOME_INIT_HOOK (script-if-gnome-enabled, failflag)
dnl
dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
dnl is not found.
dnl
AC_DEFUN([GNOME_INIT_HOOK],
[
AC_SUBST(GNOME_LIBS)
AC_SUBST(GNOMEUI_LIBS)
@ -29,9 +36,13 @@ AC_DEFUN([GNOME_INIT],
AC_ARG_WITH(gnome,
[ --with-gnome Specify prefix for GNOME files],[
LDFLAGS="$LDFLAGS -L$withval/lib"
CFLAGS="$CFLAGS -I$withval/include"
gnome_prefix=$withval/lib
if test x$withval = xyes; then
$1
else
LDFLAGS="$LDFLAGS -L$withval/lib"
CFLAGS="$CFLAGS -I$withval/include"
gnome_prefix=$withval/lib
fi
])
AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
@ -39,8 +50,15 @@ AC_DEFUN([GNOME_INIT],
AC_MSG_RESULT(found)
echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
. $gnome_prefix/gnomeConf.sh
$1
else
AC_MSG_RESULT(not found)
AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
if test x$2 = xfail; then
AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
fi
fi
])
AC_DEFUN([GNOME_INIT],[
GNOME_INIT_HOOK([],fail)
])