diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | libgtopConf.sh.in | 2 |
4 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2000-01-12 Martin Baulig <martin@home-of-linux.org> + * configure.in (LIBGTOP_BACKEND_DIR): Define this to be + `$(datadir)/libgtop/backends' and AC_SUBST it. + + * libgtopConf.sh.in (LIBGTOP_BACKEND_DIR): Added. + +2000-01-12 Martin Baulig <martin@home-of-linux.org> + * xml.m4: New file to check for libxml. * acconfig.h (HAVE_LIBXML): Define this if we have libxml. diff --git a/Makefile.am b/Makefile.am index 3c6657ef..acb0539e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,7 @@ libgtopConf.sh: libgtopConf.sh.in Makefile sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \ -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \ -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \ + -e 's#\@LIBGTOP_BACKEND_DIR\@#$(LIBGTOP_BACKEND_DIR)#g' \ -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \ -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \ -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \ diff --git a/configure.in b/configure.in index 55073c0a..66788f36 100644 --- a/configure.in +++ b/configure.in @@ -362,11 +362,14 @@ machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir" AC_SUBST(machine_incs) -INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"' +LIBGTOP_BACKEND_DIR="\$(datadir)/libgtop/backends" + +INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\" -DLIBGTOP_BACKEND_DIR=\"'"$LIBGTOP_BACKEND_DIR"'\"' AC_SUBST(INCLUDES) AC_SUBST(LIBGTOP_EXTRA_LIBS) +AC_SUBST(LIBGTOP_BACKEND_DIR) AC_SUBST(LIBGTOP_LIBS) AC_SUBST(LIBGTOP_INCS) diff --git a/libgtopConf.sh.in b/libgtopConf.sh.in index 78eac774..08e850e3 100644 --- a/libgtopConf.sh.in +++ b/libgtopConf.sh.in @@ -7,6 +7,8 @@ LIBGTOP_INCLUDEDIR="@LIBGTOP_INCLUDEDIR@" LIBGTOP_DATADIR="@LIBGTOP_DATADIR@" +LIBGTOP_BACKEND_DIR="@LIBGTOP_BACKEND_DIR@" + LIBGTOP_EXTRA_LIBS="@LIBGTOP_EXTRA_LIBS@" LIBGTOP_LIBS="@LIBGTOP_LIBS@" |