5e97af535f
* Splitted `libgtop_sysdeps.la' into `libgtop_sysdeps.la' and
`libgtop_sysdeps_suid.la'.
Everything that needs to be suid/sgid is in `libgtop_sysdeps_suid.la'
and the rest in `libgtop_sysdeps.la'.
The functions from `libgtop_sysdeps_suid.la' have the `_p' prefix and
the ones from `libgtop_sysdeps.la' the `_s' prefix.
The suid library uses `glibtop_open_p' and `glibtop_close_p', the
normal one `glibtop_init_s' (found in lib/init.c), `glibtop_open_s'
and `glibtop_close_s'.
* Added `libgtop_suid_common.la' containing stuff from sysdeps/common
that is required from the suid server (currently everything from
error.c and xmalloc.c).
This means, we can add some more stuff to `libgtop_common.la' without
the risk that it may be dangerous in the suid server.
* The ``library order'' is much clearer now:
-> `libgtop.la' (from lib/) contains user-level stuff;
all functions except `glibtop_init_r' have the `_l'
suffix.
-> `libgtop_common.la' (from sysdeps/common/) contains stuff
that is common among the sysdeps directories.
use anything from `libgtop_sysdeps.la' and
`libgtop_sysdeps_suid.la'.
-> `libgtop_sysdeps.la' (from sysdeps/<sysdeps_dir>/) contains
everything from the sysdeps directory that doesn't need to
be suid/sgid.
-> `libgtop_suid_common.la' (from sysdeps/common/) is used from
the suid server instead of `libgtop_common.la'.
-> `libgtop_sysdeps_suid.la' (from sysdeps/<sysdeps_dir>/) contains
everything from the sysdeps directory that needs to be in the
suid server.
* To summarize: the server is linked only with functions that need
to be suid and everything else is linked only with functions that
do not need to be suid.
Martin
1998-07-22 Martin Baulig <martin@home-of-linux.org>
* lib/init.c (glibtop_init_s): Added this init function of
the sysdeps directory `libgtop_sysdeps.la'.
* lib/open.c (glibtop_open_l): Unconditionally calling
`glibtop_init_s' after server initialization.
* lib/lib.awk: Removed references to functions from
`libgtop_sysdeps_suid.la' to avoid undefined symbols.
* sysdeps/stub/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/stub/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/kernel/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/kernel/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/linux/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/linux/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/osf1/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_sysdeps_suid.la' for the suid server.
* sysdeps/osf1/open_suid.c (glibtop_open_p): New file.
Contains all stuff that was formerly in `open.c'.
* sysdeps/osf1/open.c: Moved everything from here into
the new file `open_suid.c'.
* sysdeps/osf1/open.c (glibtop_open_s): New function.
* sysdeps/osf1/close_suid.c (glibtop_close_p): New file.
* sysdeps/osf1/close.c (glibtop_close_s): New function.
* sysdeps/osf1/*.c: Using the new init, open and close
functions.
* sysdeps/sun4/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_sysdeps_suid.la' for the suid server.
* sysdeps/sun4/nosuid.c (glibtop_open_s, glibtop_close_s): New file
* sysdeps/sun4/*.c: All functions now have the `_p' suffix.
* sysdeps/common/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_suid_common.la' which only contains stuff that is
needed in the suid parts.
* sysdeps/common/xmalloc.c: Using `glibtop_error_io_r' instead
of `glibtop_error_r'.
* sysdeps/{kernel, linux, osf1, sun4, stub}/init.c: Removed.
`glibtop_init_s' has been moved into `lib/init.c' since it's the
same in all the sysdeps directories.
* src/server/main.c: It is now an error to request a feature that
does not need the suid server.
* src/proxy: Removed.
266 lines
6.4 KiB
Plaintext
266 lines
6.4 KiB
Plaintext
dnl
|
|
Mnl Configure script for the Gnome library
|
|
dnl
|
|
|
|
AC_INIT(copyright.txt)
|
|
AM_CONFIG_HEADER(config.h)
|
|
AC_CANONICAL_SYSTEM
|
|
|
|
AM_INIT_AUTOMAKE(libgtop, 0.01)
|
|
|
|
AM_ACLOCAL_INCLUDE(macros)
|
|
|
|
AC_ISC_POSIX
|
|
AC_PROG_CC
|
|
AC_STDC_HEADERS
|
|
AC_ARG_PROGRAM
|
|
|
|
dnl We don't use `AC_PROG_AWK' since it checks for mawk first which
|
|
dnl does not work for libgtop.
|
|
AC_CHECK_PROGS(AWK, gawk awk, )
|
|
test -z "$AWK" && AC_MSG_ERROR([Sorry, you need a working awk interpreter.])
|
|
|
|
AC_CHECK_TOOL(CC,gcc)
|
|
AC_CHECK_TOOL(RANLIB,ranlib)
|
|
AC_CHECK_TOOL(AS,as)
|
|
AC_CHECK_TOOL(AR,ar)
|
|
AC_CHECK_TOOL(NM,nm)
|
|
|
|
NM=`which $NM`
|
|
export CC CXX RANLIB LD AS AR NM
|
|
|
|
AC_PROG_INSTALL
|
|
AC_PROG_LN_S
|
|
AC_PROG_MAKE_SET
|
|
|
|
export cross_compiling
|
|
|
|
AM_PROG_LIBTOOL
|
|
|
|
dnl If you want to use libgtop without gnome, comment the following line out.
|
|
GNOME_INIT_HOOK(gnome_found=yes)
|
|
|
|
if test "x$gnome_found" != xyes; then
|
|
GNOME_SUPPORT_CHECKS
|
|
else
|
|
AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
|
|
AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
|
|
fi
|
|
|
|
AC_LC_SYSDEPS
|
|
|
|
if test x$libgtop_want_guile = xyes ; then
|
|
GNOME_CHECK_GUILE
|
|
if test x$ac_cv_guile_found = xyes ; then
|
|
if test x$libgtop_want_names = xyes ; then
|
|
AC_DEFINE(GLIBTOP_GUILE_NAMES)
|
|
fi
|
|
guile_examples='third third_static'
|
|
guile_subdirs='guile'
|
|
else
|
|
guile_examples=
|
|
guile_subdirs=
|
|
fi
|
|
else
|
|
guile_examples=
|
|
guile_subdirs=
|
|
fi
|
|
|
|
AC_SUBST(guile_examples)
|
|
AC_SUBST(guile_subdirs)
|
|
|
|
AM_PROG_LIBTOOL
|
|
|
|
dnl You need to uncomment the following line if you want to use libgtop without Gnome.
|
|
dnl GNOME_SUPPORT_CHECKS
|
|
|
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
AC_C_CONST
|
|
AC_C_INLINE
|
|
AC_TYPE_OFF_T
|
|
AC_TYPE_PID_T
|
|
AC_TYPE_SIZE_T
|
|
AC_STRUCT_ST_RDEV
|
|
AC_HEADER_TIME
|
|
AC_STRUCT_TM
|
|
AC_TYPE_UID_T
|
|
|
|
dnl For SunOS
|
|
AC_CHECK_TYPE(ssize_t, int)
|
|
AC_CHECK_HEADERS(memory.h)
|
|
AC_CHECK_HEADERS(string.h strings.h, break)
|
|
AC_REPLACE_FUNCS(strerror)
|
|
AC_CHECK_LIB(kvm, kvm_open)
|
|
|
|
dnl For DEC OSF1
|
|
AC_CHECK_LIB(mach, vm_statistics)
|
|
|
|
dnl Checks for library functions.
|
|
AC_FUNC_ALLOCA
|
|
AC_FUNC_MMAP
|
|
AC_TYPE_SIGNAL
|
|
AC_FUNC_STRFTIME
|
|
AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
|
|
|
|
ALL_LINGUAS="fr"
|
|
AM_GNU_GETTEXT
|
|
|
|
AC_PATH_XTRA
|
|
|
|
dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n
|
|
dnl So we use the following instead.
|
|
dnl XE_SPACE(var, words)
|
|
define([XE_SPACE],[
|
|
T=""
|
|
for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
|
|
$1="$T"
|
|
])dnl
|
|
|
|
dnl Autodetect Xauth
|
|
dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
|
|
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
|
|
test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h, ,with_xauth=no) }
|
|
test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
|
|
test -z "$with_xauth" && with_xauth=yes
|
|
if test "$with_xauth" = "yes"; then
|
|
AC_DEFINE(HAVE_XAUTH)
|
|
XE_SPACE(libs_xauth, $X_LIBS -lXau)
|
|
fi
|
|
AC_SUBST(libs_xauth)
|
|
|
|
dnl For diskusage stuff
|
|
GNOME_FILEUTILS_CHECKS
|
|
|
|
CFLAGS="$CFLAGS -D_IN_LIBGTOP"
|
|
|
|
AC_SUBST(CFLAGS)
|
|
AC_SUBST(CPPFLAGS)
|
|
AC_SUBST(LDFLAGS)
|
|
|
|
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],AC_DEFINE(GNOME_ENABLE_DEBUG),)
|
|
|
|
dnl If you want to use libgtop without gnome, uncomment the following paragraph:
|
|
dnl LIBSUPPORT=
|
|
dnl SUPPORTINCS=
|
|
dnl if test "$need_gnome_support" = yes; then
|
|
dnl LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
|
|
dnl SUPPORTINCS='-I$(top_srcdir)/support'
|
|
dnl fi
|
|
dnl AC_SUBST(LIBSUPPORT)
|
|
dnl AC_SUBST(SUPPORTINCS)
|
|
|
|
dnl Some ugly hack; if '-lgnomesupport' is part of $GNOME_LIBS, we include it here.
|
|
echo "$GNOME_LIBS" | grep -q -e '-lgnomesupport'
|
|
if test $? = 0 ; then
|
|
LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
|
|
SUPPORTINCS="$GNOME_INCLUDEDIR"
|
|
fi
|
|
AC_SUBST(LIBSUPPORT)
|
|
AC_SUBST(SUPPORTINCS)
|
|
|
|
dnl These definitions are expanded in make.
|
|
LIBGTOP_LIBS='-L$(libdir) -lgtop'
|
|
LIBGTOP_INCS='-I$(includedir)'
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
|
|
LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
|
|
LIBGTOP_BINDIR='$(bindir)'
|
|
LIBGTOP_SERVER='$(bindir)/gtop_server'
|
|
|
|
sysdeps_dir="$libgtop_sysdeps_dir"
|
|
AC_SUBST(sysdeps_dir)
|
|
|
|
if test x$ac_cv_guile_found = xyes ; then
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
|
|
libgtop_guile_found=yes
|
|
else
|
|
libgtop_guile_found=no
|
|
fi
|
|
|
|
AC_SUBST(libgtop_guile_found)
|
|
|
|
if test x$libgtop_want_names = xyes ; then
|
|
if test x$ac_cv_guile_found = xyes ; then
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names"
|
|
libgtop_want_guile_names=yes
|
|
else
|
|
libgtop_want_guile_names=no
|
|
fi
|
|
LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_names"
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_names"
|
|
fi
|
|
|
|
AC_SUBST(libgtop_want_guile_names)
|
|
|
|
LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common $libs_xauth"
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common $libs_xauth"
|
|
|
|
if test "x$need_server" = "xyes" ; then
|
|
LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop"
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop"
|
|
else
|
|
LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_sysdeps"
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_sysdeps"
|
|
fi
|
|
|
|
if test "x$ac_cv_guile_found" = "xyes" ; then
|
|
LIBGTOP_INCS="$LIBGTOP_INCS $GUILE_INCS"
|
|
LIBGTOP_GUILE_INCS="$LIBGTOP_INCS $GUILE_INCS"
|
|
LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
|
|
fi
|
|
|
|
machine_incs='-I$(top_srcdir)/sysdeps/@sysdeps_dir@'
|
|
|
|
AC_SUBST(machine_incs)
|
|
|
|
AC_SUBST(LIBGTOP_LIBS)
|
|
AC_SUBST(LIBGTOP_INCS)
|
|
AC_SUBST(LIBGTOP_GUILE_LIBS)
|
|
AC_SUBST(LIBGTOP_GUILE_INCS)
|
|
AC_SUBST(LIBGTOP_BINDIR)
|
|
AC_SUBST(LIBGTOP_SERVER)
|
|
|
|
LIBSUPPORT=
|
|
SUPPORTINCS=
|
|
if test "$need_gnome_support" = yes; then
|
|
if test "x$gnome_found" = xyes ; then
|
|
LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
|
|
SUPPORTINCS="$GNOME_INCLUDEDIR"
|
|
else
|
|
LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
|
|
SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
|
|
fi
|
|
fi
|
|
|
|
if test x$libgtop_need_server = xyes ; then
|
|
sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la"
|
|
else
|
|
sysdeps_suid_lib=
|
|
fi
|
|
AC_SUBST(sysdeps_suid_lib)
|
|
|
|
AC_OUTPUT([
|
|
Makefile
|
|
po/Makefile.in
|
|
intl/Makefile
|
|
include/Makefile
|
|
include/glibtop/Makefile
|
|
sysdeps/Makefile
|
|
sysdeps/common/Makefile
|
|
sysdeps/names/Makefile
|
|
sysdeps/guile/Makefile
|
|
sysdeps/guile/names/Makefile
|
|
sysdeps/stub/Makefile
|
|
sysdeps/sun4/Makefile
|
|
sysdeps/osf1/Makefile
|
|
sysdeps/linux/Makefile
|
|
sysdeps/kernel/Makefile
|
|
src/Makefile
|
|
src/server/Makefile
|
|
src/proxy/Makefile
|
|
src/daemon/Makefile
|
|
lib/Makefile
|
|
examples/Makefile
|
|
perl/Makefile.PL
|
|
support/Makefile
|
|
macros/Makefile],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
|