Package: psmisc Version: 21.6cvs Author: Guillem Jover Status: applied Description: Update autoconf. To do as well: RM="cvs rm -f" $RM ABOUT-NLS $RM po/Makefile.in.in $RM po/Makevars.template $RM po/*.sin $RM po/*.sed $RM po/*.header $RM po/Rules-quot $RM intl/ $RM config.rpath Index: po/LINGUAS --- /dev/null +++ po/LINGUAS @@ -0,0 +1,2 @@ +# Enabled languages +ca de eu fi fr it pl pt sv Index: .cvsignore =================================================================== RCS file: /cvsroot/psmisc/psmisc/.cvsignore,v retrieving revision 1.5 diff -u -r1.5 .cvsignore --- .cvsignore 25 Nov 2004 03:54:59 -0000 1.5 +++ .cvsignore 23 Feb 2005 01:19:45 -0000 @@ -8,11 +8,13 @@ aclocal.m4 autom4te.cache confdefs.h +config config.cache config.guess config.h config.h.in config.log +config.rpath config.status config.sub configure @@ -20,6 +22,7 @@ libtool ltconfig ltmain.sh +m4 missing mkinstalldirs psmisc-*.tar.gz Index: Makefile.am =================================================================== RCS file: /cvsroot/psmisc/psmisc/Makefile.am,v retrieving revision 1.12 diff -u -r1.12 Makefile.am --- Makefile.am 25 Nov 2004 03:54:59 -0000 1.12 +++ Makefile.am 23 Feb 2005 01:57:36 -0000 @@ -1,5 +1,2 @@ - SUBDIRS = doc src po icons -EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs - Index: autogen.sh =================================================================== RCS file: /cvsroot/psmisc/psmisc/autogen.sh,v retrieving revision 1.1 diff -u -r1.1 autogen.sh --- autogen.sh 30 Apr 2004 03:33:12 -0000 1.1 +++ autogen.sh 23 Feb 2005 01:19:45 -0000 @@ -7,27 +7,33 @@ PROJECT=psmisc -(autoconf --version) < /dev/null > /dev/null 2>&1 || { +# Make it possible to specify path in the environment +: ${AUTOCONF=autoconf} +: ${AUTOHEADER=autoheader} +: ${AUTOMAKE=automake} +: ${ACLOCAL=aclocal} +: ${AUTOPOINT=autopoint} + +($AUTOPOINT --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + echo "You must have gettext installed to compile $PROJECT." + echo "Get ftp://ftp.gnu.org/pub/gnu/gettext-0.14.1.tar.gz" + echo "(or a newer version if it is available)" DIE=1 } -# Do we really need libtool? -(libtool --version) < /dev/null > /dev/null 2>&1 || { +($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have libtool installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz" - echo "(or a newer version if it is available)" + echo "You must have autoconf installed to compile $PROJECT." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" DIE=1 } -(automake --version) < /dev/null > /dev/null 2>&1 || { +($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" + echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.6.tar.gz" echo "(or a newer version if it is available)" DIE=1 } @@ -46,19 +52,22 @@ esac for dir in . -do +do echo processing $dir - (cd $dir; \ - aclocalinclude="$ACLOCAL_FLAGS"; \ - aclocal $aclocalinclude -I m4; \ - autoheader; automake --add-missing --gnu $am_opt; autoconf) + cd $dir + configdir="config" + test -d $configdir || mkdir $configdir + aclocalinclude="$ACLOCAL_FLAGS" + $AUTOPOINT + $ACLOCAL $aclocalinclude -I $configdir + $AUTOHEADER -Wall + $AUTOMAKE -Wall --add-missing --gnu $am_opt + $AUTOCONF -Wall + cd - done ./configure "$@" -echo +echo echo "Now type 'make' to compile $PROJECT." - - - Index: configure.in =================================================================== RCS file: /cvsroot/psmisc/psmisc/configure.in,v retrieving revision 1.32 diff -u -r1.32 configure.in --- configure.in 10 Dec 2004 11:31:28 -0000 1.32 +++ configure.in 23 Feb 2005 01:19:45 -0000 @@ -1,34 +1,35 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT +AC_INIT([psmisc], [21.6cvs]) +AC_PREREQ(2.53) AC_CONFIG_SRCDIR([src/comm.h]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(psmisc,21.6cvs) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_AUX_DIR([config]) +AM_INIT_AUTOMAKE([1.6]) dnl Checks for programs. AC_PROG_CC AC_PROG_CPP -AC_PROG_LIBTOOL dnl checks for options -AC_SUBST(FLASK_LINUX) -AC_ARG_ENABLE(flask,[ --enable-flask Enable Security-Enhanced Linux features], - AC_DEFINE([FLASK_LINUX],1,[Use Security-Enhanced Linux features]) - AC_CHECK_LIB(secure, avc_toggle, FLASK_LIB=-lsecure, - AC_MSG_ERROR(Cannot find selinux/ secure static library) - ) -,) -AC_SUBST(FLASK_LIB) +AC_SUBST([FLASK_LINUX]) +AC_ARG_ENABLE([flask], + [AS_HELP_STRING([--enable-flask], [Enable Security-Enhanced Linux features])], + [AC_DEFINE([FLASK_LINUX], [1], [Use Security-Enhanced Linux features]) + AC_CHECK_LIB([secure], [avc_toggle], [FLASK_LIB=-lsecure], [ + AC_MSG_ERROR([Cannot find selinux/ secure static library]) ]) ], + []) +AC_SUBST([FLASK_LIB]) dnl Checks for libraries. -AC_CHECK_LIB(ncurses, tgetent, TERMCAP_LIB=-lncurses, - AC_CHECK_LIB(termcap, tgetent, TERMCAP_LIB=-ltermcap, - AC_MSG_ERROR(Cannot find ncurses or termcap libraries) ) ) -AC_SUBST(TERMCAP_LIB) +AC_CHECK_LIB([ncurses], [tgetent], [TERMCAP_LIB=-lncurses], [ + AC_CHECK_LIB([termcap], [tgetent], [TERMCAP_LIB=-ltermcap], [ + AC_MSG_ERROR([Cannot find ncurses or termcap libraries]) ]) ]) +AC_SUBST([TERMCAP_LIB]) dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h unistd.h termcap.h) +AC_CHECK_HEADERS([fcntl.h limits.h sys/ioctl.h unistd.h termcap.h]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -37,14 +38,18 @@ AC_TYPE_UID_T dnl Check for language stuff -ALL_LINGUAS="ca de eu fi fr it pl pt sv" AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.14.1]) dnl Checks for library functions. -AC_CHECK_FUNCS(strdup strerror strtoul) +AC_CHECK_FUNCS([strdup strerror strtoul]) dnl Checks for Large File System AC_SYS_LARGEFILE -AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile icons/Makefile po/Makefile.in ]) +AC_CONFIG_FILES([Makefile + doc/Makefile + src/Makefile + icons/Makefile + po/Makefile.in]) AC_OUTPUT