Commit 7b9710e0 authored by Mathieu Lacage's avatar Mathieu Lacage Committed by Mathieu Lacage

add a check for medusa. It is not perfect, it still needs some work but it



2000-07-17  Mathieu Lacage <mathieu@eazel.com>

        * configure.in: add a check for medusa. It is
        not perfect, it still needs some work but it is better
        than nothing.
        * components/*/Makefile.am: add BONOBO_CFLAGS where necessary.
        * libnautilus-extensions/Makefile.am: add MEDUSA_CFLAGS and
        MEDUSA_LIBS.
parent aced9485
2000-07-17 Mathieu Lacage <mathieu@eazel.com>
* configure.in: add a check for medusa. It is
not perfect, it still needs some work but it is better
than nothing.
* components/*/Makefile.am: add BONOBO_CFLAGS where necessary.
* libnautilus-extensions/Makefile.am: add MEDUSA_CFLAGS and
MEDUSA_LIBS.
2000-07-17 Andy Hertzfeld <andy@eazel.com>
* libnautilus-extensions/nautilus-icon-factory.c:
......
......@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir) \
$(GCONF_CFLAGS) \
$(VFS_CFLAGS) \
$(BONOBO_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(GNOMEUI_CFLAGS)
......
......@@ -12,6 +12,7 @@ INCLUDES = \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(BONOBO_CFLAGS) \
$(VFS_CFLAGS) \
$(LIBWWW_CFLAGS) \
-D_VERSION=\"$(VERSION)\"
......
NULL=
CPPFLAGS = \
-DPREFIX=\"$(prefix)\"
-DG_LOG_DOMAIN=\"Nautilus-Test\"
......@@ -5,8 +7,11 @@ CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS)
$(OAF_CFLAGS) \
$(BONOBO_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(NULL)
oafdir = $(datadir)/oaf
......
......@@ -5,7 +5,9 @@ CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GCONF_CFLAGS) \
$(GCONF_CFLAGS) \
$(OAF_CFLAGS) \
$(BONOBO_CFLAGS) \
$(GNOMEUI_CFLAGS)
oafdir = $(datadir)/oaf
......
......@@ -5,9 +5,11 @@ CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GCONF_CFLAGS) \
$(GCONF_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(GNOMEUI_CFLAGS) \
$(OAF_CFLAGS) \
$(BONOBO_CFLAGS) \
$(VFS_CFLAGS)
oafdir = $(datadir)/oaf
......
NULL=
CPPFLAGS = \
-DPREFIX=\"$(prefix)\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
......@@ -6,9 +8,12 @@ CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(VFS_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS)
$(VFS_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(OAF_CFLAGS) \
$(BONOBO_CFLAGS) \
$(NULL)
oafdir = $(datadir)/oaf
......
......@@ -308,6 +308,33 @@ fi
AC_SUBST(GTKHTML_LIBS)
AC_SUBST(GTKHTML_CFLAGS)
dnl =======================
dnl begin tests for medusa
dnl =======================
MEDUSA_CFLAGS=""
MEDUSA_LIBS=""
AC_MSG_CHECKING(for Medusa)
if test -n `medusa-config --libs | cut -d ' ' -f1` ;
then
MEDUSA_CFLAGS=`medusa-config --cflags`
MEDUSA_LIBS=`medusa-config --libs`
AC_MSG_RESULT(yes)
else
MEDUSA_CFLAGS=""
MEDUSA_LIBS=""
AC_MSG_RESULT(no)
AC_MSG_ERROR(Could not find medusa library. Please, get it from GNOME's cvs.)
fi
AC_SUBST(MEDUSA_CFLAGS)
AC_SUBST(MEDUSA_LIBS)
dnl =======================
dnl end tests for medusa
dnl =======================
dnl Test for libpng
if test -z "$LIBPNG"; then
AC_CHECK_LIB(png, png_read_info,
......
......@@ -2,33 +2,36 @@ NULL=
lib_LTLIBRARIES=libnautilus-extensions.la
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/libnautilus \
-I$(top_srcdir)/cut-n-paste-code \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GHTTP_CFLAGS) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
-D_REENTRANT \
-DDATADIR=\""$(datadir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/libnautilus \
-I$(top_srcdir)/cut-n-paste-code \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GHTTP_CFLAGS) \
$(VFS_CFLAGS) \
$(GCONF_CFLAGS) \
$(XML_CFLAGS) \
$(MEDUSA_CFLAGS) \
-D_REENTRANT \
-DDATADIR=\""$(datadir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
$(NULL)
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG) \
libnautilus_extensions_la_LDFLAGS= \
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(MEDUSA_LIBS) \
$(LIBPNG) \
$(NULL)
libnautilus_extensions_la_SOURCES = \
libnautilus_extensions_la_SOURCES = \
bonobo-stream-vfs.c \
nautilus-background-canvas-group.c \
nautilus-background.c \
......
......@@ -2,33 +2,36 @@ NULL=
lib_LTLIBRARIES=libnautilus-extensions.la
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/libnautilus \
-I$(top_srcdir)/cut-n-paste-code \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GHTTP_CFLAGS) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
-D_REENTRANT \
-DDATADIR=\""$(datadir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/libnautilus \
-I$(top_srcdir)/cut-n-paste-code \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GHTTP_CFLAGS) \
$(VFS_CFLAGS) \
$(GCONF_CFLAGS) \
$(XML_CFLAGS) \
$(MEDUSA_CFLAGS) \
-D_REENTRANT \
-DDATADIR=\""$(datadir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
$(NULL)
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG) \
libnautilus_extensions_la_LDFLAGS= \
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(MEDUSA_LIBS) \
$(LIBPNG) \
$(NULL)
libnautilus_extensions_la_SOURCES = \
libnautilus_extensions_la_SOURCES = \
bonobo-stream-vfs.c \
nautilus-background-canvas-group.c \
nautilus-background.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment