diff --git a/acconfig.h b/acconfig.h index 433e587e..1196dc40 100644 --- a/acconfig.h +++ b/acconfig.h @@ -182,7 +182,7 @@ #undef LIBGTOP_MODEM_LOCKFILE /* Define to enable dynamic linking of the backends. */ -#undef USE_GMODULE +#undef LIBGTOP_USE_GMODULE /* Define if we need the LibGTop server. */ #undef LIBGTOP_NEED_SERVER diff --git a/configure.in b/configure.in index 87f5b86d..9ba5488f 100644 --- a/configure.in +++ b/configure.in @@ -349,16 +349,16 @@ LIBGTOP_SERVER='$(bindir)/libgtop_server' LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS $LIBGTOP_XML_LIB" -LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop" - if test x$libgtop_use_gmodule != xyes ; then - LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_backend_common -lgtop_common" + LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_backend_common -lgtop_common" if test x$libgtop_have_sysdeps = xyes ; then LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_backend_sysdeps -lgtop_sysdeps" fi if test x$libgtop_need_server = xyes ; then LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_backend_server" fi +else + LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common -lgtop" fi LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names" diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4 index e73b62f1..00fdeb80 100644 --- a/libgtop-sysdeps.m4 +++ b/libgtop-sysdeps.m4 @@ -208,7 +208,7 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[ fi if $dynworks; then - AC_DEFINE(USE_GMODULE) + AC_DEFINE(LIBGTOP_USE_GMODULE) GMODULE_LIBS="`glib-config --libs gmodule`" GMODULE_FLAGS="`glib-config --cflags gmodule`" AC_SUBST(GMODULE_LIBS)