Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added this to CVS and hacked it to use `$CC -shared' to create shared

Browse Source 
2000-02-22  Martin Baulig  <martin@home-of-linux.org>

	* ltconfig: Added this to CVS and hacked it to use `$CC -shared'
	to create shared libraries on Solaris.

	* automake.sh: Don't run libtoolize on Solaris but use the CVS
	version instead.
This commit is contained in:
Martin Baulig
2000-02-22 19:58:58 +00:00
committed by Martin Baulig
parent 0a3a0c1a34
commit 00d9dd7065
6 changed files with 3128 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@@ -20,7 +20,6 @@ libgtop-1.*.*
libgtop-mirror.sh.swp libgtop-mirror.sh.swp
libgtopConf.sh libgtopConf.sh
libtool libtool
ltconfig
ltmain.sh ltmain.sh
macros macros
stamp-h stamp-h

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2000-02-22 Martin Baulig <martin@home-of-linux.org>
* ltconfig: Added this to CVS and hacked it to use `$CC -shared'
to create shared libraries on Solaris.
* automake.sh: Don't run libtoolize on Solaris but use the CVS
version instead.
2000-02-16 Martin Baulig <martin@home-of-linux.org> 2000-02-16 Martin Baulig <martin@home-of-linux.org>
* configure.in (LIBGTOP_LIBS): Add `-lgtop_backend_sysdeps' and * configure.in (LIBGTOP_LIBS): Add `-lgtop_backend_sysdeps' and

7
autogen.sh
View File

@@ -14,7 +14,12 @@ PKG_NAME="Gnome Top Library"
exit 1 exit 1
} }
. $srcdir/macros/autogen.sh if test `uname` = 'SunOS' ; then
NO_LIBTOOLIZE=yes . $srcdir/macros/autogen.sh
else
. $srcdir/macros/autogen.sh
fi
cp -f $srcdir/po/Makefile.in.in.in $srcdir/po/Makefile.in.in cp -f $srcdir/po/Makefile.in.in.in $srcdir/po/Makefile.in.in
echo "" echo ""

38
libgtop-sysdeps.m4
View File

@@ -157,7 +157,7 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[
else else
with_modules=no with_modules=no
fi fi
]) ],[with_modules=auto])
dynworks=false dynworks=false
deps= deps=
@@ -167,8 +167,8 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
fi fi
if test x$with_modules = xyes; then AC_MSG_CHECKING(whether dynamic modules work)
AC_MSG_CHECKING(whether dynamic modules work) if test x$with_modules = xauto; then
oLIBS="$LIBS" oLIBS="$LIBS"
oCFLAGS="$CFLAGS" oCFLAGS="$CFLAGS"
LIBS="`glib-config --libs gmodule`" LIBS="`glib-config --libs gmodule`"
@@ -186,20 +186,24 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[
], dynworks=true, dynworks=false, dynworks=true) ], dynworks=true, dynworks=false, dynworks=true)
LIBS="$oLIBS" LIBS="$oLIBS"
CFLAGS="$oCFLAGS" CFLAGS="$oCFLAGS"
fi
dnl Now we check to see if our libtool supports shared lib deps dnl Now we check to see if our libtool supports shared lib deps
dnl (in a rather ugly way even) dnl (in a rather ugly way even)
if $dynworks; then if $dynworks; then
libgtop_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config" libgtop_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
libgtop_deplibs_check=`$libgtop_libtool_config | \ libgtop_deplibs_check=`$libgtop_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''\"]]' | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''\"]]' | \
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
if test "x$libgtop_deplibs_check" = "xnone" || \ if test "x$libgtop_deplibs_check" = "xnone" || \
test "x$libgtop_deplibs_check" = "xunknown" || \ test "x$libgtop_deplibs_check" = "xunknown" || \
test "x$libgtop_deplibs_check" = "x"; then test "x$libgtop_deplibs_check" = "x"; then
dynworks=false dynworks=false
fi
fi fi
elif test x$with_modules = xyes; then
dynworks=true
else
dynworks=false
fi fi
if $dynworks; then if $dynworks; then
@@ -215,9 +219,9 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[
libgtop_dynamic_ldflags= libgtop_dynamic_ldflags=
fi fi
AC_SUBST(libgtop_dynamic_ldflags)
AC_MSG_RESULT($libgtop_use_gmodule) AC_MSG_RESULT($libgtop_use_gmodule)
AC_SUBST(libgtop_dynamic_ldflags)
]) ])
AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

3086
ltconfig Executable file
View File

File diff suppressed because it is too large Load Diff

12
sysdeps/solaris/Makefile.am
View File

@@ -2,7 +2,11 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@ INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la dynamic_ldflags = @libgtop_dynamic_ldflags@
backenddir = @LIBGTOP_BACKEND_DIR@
backend_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la
libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c \ libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c \
safeio.c swap.c uptime.c loadavg.c \ safeio.c swap.c uptime.c loadavg.c \
@@ -12,14 +16,12 @@ libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c \
procmap.c netload.c netinfo.c ppp.c \ procmap.c netload.c netinfo.c ppp.c \
procdata.c interfaces.c procdata.c interfaces.c
libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) -module -export-dynamic libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) $(dynamic_ldflags)
libgtop_sysdeps_la_LIBADD = @DL_LIB@
libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c \ libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c \
shm_limits.c msg_limits.c sem_limits.c shm_limits.c msg_limits.c sem_limits.c
libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) -module -export-dynamic libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) $(dynamic_ldflags)
include_HEADERS = glibtop_server.h glibtop_machine.h include_HEADERS = glibtop_server.h glibtop_machine.h