diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1998-03-20 10:54:16 +0800 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-03-20 10:54:16 +0800 |
| commit | 1c388d981788a7706ef238c1aef6f9d3301b2718 (patch) | |
| tree | 681eaecc785da91bf17c2884ef8e2de16831ffe0 /macros/gnome.m4 | |
| parent | 15549badbe64f29b05977b6c45eef475d73a59c8 (diff) | |
| download | gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.tar gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.tar.gz gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.tar.bz2 gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.tar.lz gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.tar.xz gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.tar.zst gsoc2013-evolution-1c388d981788a7706ef238c1aef6f9d3301b2718.zip | |
Weee! gmc uses the gnome.m4 macros now and detects properly gnome installation - mig
svn path=/trunk/; revision=72
Diffstat (limited to 'macros/gnome.m4')
| -rw-r--r-- | macros/gnome.m4 | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/macros/gnome.m4 b/macros/gnome.m4 index 461e0b7f54..283745c111 100644 --- a/macros/gnome.m4 +++ b/macros/gnome.m4 @@ -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) +])
\ No newline at end of file |