Added `LIBGTOP_MICRO_VERSION'. Likewise.

1998-08-18 Martin Baulig <martin@home-of-linux.org> * LIBGTOP-VERSION: Added `LIBGTOP_MICRO_VERSION'. * libgtopConf.sh.in: Likewise. * libgtopConf.sh.in: Added `LIBGTOP_EXTRA_LIBS'.
1998-08-18 12:15:07 +00:00
parent fd6b79d33d
commit 302b785893
6 changed files with 35 additions and 12 deletions
--- a/5
+++ b/5
@@ -1,5 +1,10 @@
 1998-08-18  Martin Baulig  <martin@home-of-linux.org>

+	* LIBGTOP-VERSION: Added `LIBGTOP_MICRO_VERSION'.
+	* libgtopConf.sh.in: Likewise.
+
+	* libgtopConf.sh.in: Added `LIBGTOP_EXTRA_LIBS'.
+	
 	* sysdeps/linux/procmap.c: Added implementation.

 1998-08-17  Martin Baulig  <martin@home-of-linux.org>
--- a/5
+++ b/5
@@ -1,6 +1,7 @@
 LIBGTOP_MAJOR_VERSION=0
-LIBGTOP_MINOR_VERSION=25pre1
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
+LIBGTOP_MINOR_VERSION=25
+LIBGTOP_MICRO_VERSION=0
+LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION

 # Increase each time you change the client/server protocol.
 LIBGTOP_SERVER_VERSION=1
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
 	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
 	    -e 's,\@LIBGTOP_INCLUDEDIR\@,$(includedir),g' \
+	    -e 's,\@LIBGTOP_EXTRA_LIBS\@,$(LIBGTOP_EXTRA_LIBS),g' \
 	    -e 's,\@LIBGTOP_LIBS\@,$(LIBGTOP_LIBS),g' \
 	    -e 's,\@LIBGTOP_INCS\@,$(LIBGTOP_INCS),g' \
 	    -e 's,\@LIBGTOP_NAMES_LIBS\@,$(LIBGTOP_NAMES_LIBS),g' \
@@ -63,6 +64,7 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	    -e 's,\@LIBGTOP_SERVER\@,$(LIBGTOP_SERVER),g' \
 	    -e 's,\@LIBGTOP_MAJOR_VERSION\@,$(LIBGTOP_MAJOR_VERSION),g' \
 	    -e 's,\@LIBGTOP_MINOR_VERSION\@,$(LIBGTOP_MINOR_VERSION),g' \
+	    -e 's,\@LIBGTOP_MICRO_VERSION\@,$(LIBGTOP_MICRO_VERSION),g' \
 	    -e 's,\@LIBGTOP_VERSION\@,$(LIBGTOP_VERSION),g' \
 	    -e 's,\@LIBGTOP_SERVER_VERSION\@,$(LIBGTOP_SERVER_VERSION),g' \
 	    -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

 AC_SUBST(LIBGTOP_MAJOR_VERSION)
 AC_SUBST(LIBGTOP_MINOR_VERSION)
+AC_SUBST(LIBGTOP_MICRO_VERSION)
 AC_SUBST(LIBGTOP_SERVER_VERSION)
 AC_SUBST(LIBGTOP_VERSION)

@@ -68,8 +69,10 @@ AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])

+LIBGTOP_EXTRA_LIBS=
+
 if test x$build_inodedb = xyes ; then
-  AC_CHECK_LIB(gdbm, gdbm_open, , build_inodedb=no)
+  AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no)
 fi

 AM_CONDITIONAL(INODEDB, test x$build_inodedb = xyes)
@@ -218,6 +221,12 @@ fi

 AC_SUBST(libgtop_guile_found)

+if test -z $LIBGTOP_EXTRA_LIBS ; then
+  LIBGTOP_EXTRA_LIBS="$libs_xauth"
+else
+  LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
+fi
+
 LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common -lgtop_sysdeps"
 LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common -lgtop_sysdeps"

@@ -225,10 +234,10 @@ LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
 LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names"
 LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_names"

-LIBGTOP_LIBS="$LIBGTOP_LIBS $libs_xauth" 
-LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS $libs_xauth"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $libs_xauth"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_NAMES_LIBS $libs_xauth"
+LIBGTOP_LIBS="$LIBGTOP_LIBS" 
+LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_NAMES_LIBS"

 LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
 LIBGTOP_GUILE_INCS="$LIBGTOP_GUILE_INCS $GUILE_INCS -DGLIBTOP_GUILE"
@@ -251,6 +260,8 @@ INCLUDES="$CFLAGS -D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES $guile_def -I\$(to

 AC_SUBST(INCLUDES)

+AC_SUBST(LIBGTOP_EXTRA_LIBS)
+
 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -17,7 +17,7 @@ first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@

 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
@@ -27,7 +27,7 @@ second_SOURCES		= second.c
 second_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@

 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
@@ -37,7 +37,7 @@ procmap_SOURCES		= procmap.c
 procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@

 procmap_static_SOURCES	= $(procmap_SOURCES)
 procmap_static_LDADD	= $(procmap_LDADD)
@@ -54,7 +54,8 @@ third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
 			  $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@ \
+			  @LIBGTOP_EXTRA_LIBS@

 third_static_SOURCES	= $(third_SOURCES)
 third_static_LDADD	= $(third_LDADD)
@@ -64,7 +65,7 @@ mountlist_SOURCES	= mountlist.c
 mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@

 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
--- a/libgtopConf.sh.in
+++ b/libgtopConf.sh.in
@@ -5,6 +5,8 @@
 LIBGTOP_LIBDIR="@LIBGTOP_LIBDIR@"
 LIBGTOP_INCLUDEDIR="@LIBGTOP_INCLUDEDIR@"

+LIBGTOP_EXTRA_LIBS="@LIBGTOP_EXTRA_LIBS@"
+
 LIBGTOP_LIBS="@LIBGTOP_LIBS@"
 LIBGTOP_INCS="@LIBGTOP_INCS@"

@@ -22,6 +24,7 @@ LIBGTOP_SERVER="@LIBGTOP_SERVER@"

 LIBGTOP_MAJOR_VERSION="@LIBGTOP_MAJOR_VERSION@"
 LIBGTOP_MINOR_VERSION="@LIBGTOP_MINOR_VERSION@"
+LIBGTOP_MICRO_VERSION="@LIBGTOP_MICRO_VERSION@"
 LIBGTOP_VERSION="@LIBGTOP_VERSION@"

 LIBGTOP_SERVER_VERSION="@LIBGTOP_SERVER_VERSION@"