Commit f0480d09 authored by J Shane Culpepper's avatar J Shane Culpepper

Added a gnet configure test so that gnet is no longer hard coded in makefiles.

parent 8f1ef24d
2000-04-24 J. Shane Culpepper <pepper@eazel.com>
*configure.in
*components/services/install/Makefile.am
Adding a gnet configure option to remove hardcoded makefile references.
2000-04-24 Darin Adler <darin@eazel.com>
* libnautilus-extensions/nautilus-icon-grid.c:
......
......@@ -8,6 +8,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I/usr/include/rpm \
$(GNET_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(OAF_CFLAGS) \
......@@ -28,11 +29,11 @@ eazel_install_SOURCES = \
$(NULL)
eazel_install_LDFLAGS = \
-lpopt \
-lgnet \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS) \
$(OAF_LIBS) \
$(XML_LIBS) \
$(GNET_LIBS) \
$(RPM_LIBS) \
$(NULL)
......@@ -175,6 +175,23 @@ XML_CFLAGS=`$XML_CONFIG --cflags`
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
dnl ====================================
dnl = begin gnet checks
dnl ====================================
AC_PATH_PROG(GNET_CONFIG,gnet-config,no)
if test x$GNET_CONFIG = xno; then
AC_MSG_ERROR(Could not find gnet libraries.)
fi
GNET_LIBS=`$GNET_CONFIG --libs`
GNET_CFLAGS=`$GNET_CONFIG --cflags`
AC_SUBST(GNET_LIBS)
AC_SUBST(GNET_CFLAGS)
dnl ====================================
dnl = end gnet checks
dnl ====================================
AC_PATH_PROG(LIBWWW_CONFIG,libwww-config,no)
if test x$LIBWWW_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find libwww-config try http://www.w3.org/Library/Distribution.html to get a copy of libwww)
......
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