From: Craig Small Date: Tue, 17 Apr 2007 23:23:52 +0000 (+0000) Subject: added configure.ac and removed configure.in X-Git-Tag: v22.11~63 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90120f17503b629d57076bcf8241ac473dcb1114;p=psmisc added configure.ac and removed configure.in --- diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..13d3bef --- /dev/null +++ b/configure.ac @@ -0,0 +1,93 @@ +dnl Process this file with autoconf to produce a configure script. +AC_PREREQ(2.61) +AC_INIT([psmisc],[22.5cvs]) +AC_CONFIG_SRCDIR([src/comm.h]) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_AUX_DIR([config]) +AM_INIT_AUTOMAKE([1.10]) + +dnl Checks for programs. +AC_PROG_CXX +AC_PROG_CC +#AC_PROG_CPP +AC_PROG_MAKE_SET +AC_PROG_LN_S + +dnl checks for options +AC_SUBST([WITH_SELINUX]) +AC_ARG_ENABLE([selinux], + [AS_HELP_STRING([--enable-selinux], [Enable Security-Enhanced Linux features])], + [enable_selinux=$enableval], + [enable_selinux="no"]) +if test "$enable_selinux" = "yes"; then + AC_DEFINE([WITH_SELINUX], [1], [Use Security-Enhanced Linux features]) + AC_CHECK_LIB([selinux], [getfilecon], [SELINUX_LIB=-lselinux], [ + AC_MSG_ERROR([Cannot find selinux static library]) ]) +fi +AC_SUBST([SELINUX_LIB]) + +dnl ipv4 only option +AC_SUBST([WITH_IPV6]) +AC_ARG_ENABLE([ipv6], + [AS_HELP_STRING([--disable-ipv6], [Disable IPv6 checks (for uClibc)])], + [enable_ipv6=$enableval], + [enable_ipv6="yes"]) +if test "$enable_ipv6" = "yes"; then + AC_DEFINE([WITH_IPV6], [1], [Use IPv6 checks]) +fi + +dnl Checks for libraries. +AC_CHECK_LIB([tinfo], [tgetent], [TERMCAP_LIB=-ltinfo], + [ AC_CHECK_LIB([ncurses], [tgetent], [TERMCAP_LIB=-lncurses], + [ AC_CHECK_LIB([termcap], [tgetent], [TERMCAP_LIB=-ltermcap], + [ AC_MSG_ERROR([Cannot find tinfo, ncurses or termcap libraries]) + ] ) + ] ) + ] ) +AC_SUBST([TERMCAP_LIB]) + +dnl Checks for header files. +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_HEADER_SYS_WAIT +AC_CHECK_HEADERS([arpa/inet.h fcntl.h langinfo.h libintl.h limits.h locale.h mntent.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h]) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_PID_T +AC_TYPE_SIZE_T +AC_CHECK_MEMBERS([struct stat.st_rdev]) +AC_TYPE_UID_T +AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax, struct user_regs_struct.eax, struct user_regs_struct.ebx, struct user_regs_struct.ecx, struct user_regs_struct.edx], [],[], [#include ]) +AM_CONDITIONAL(WANT_PEEKFD, + test $ac_cv_member_struct_user_regs_struct_orig_eax = yes && + test $ac_cv_member_struct_user_regs_struct_eax = yes && + test $ac_cv_member_struct_user_regs_struct_ebx = yes && + test $ac_cv_member_struct_user_regs_struct_ecx = yes && + test $ac_cv_member_struct_user_regs_struct_edx = yes ) + +dnl Check for language stuff +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.16.1]) + +dnl Checks for library functions. +AC_FUNC_CLOSEDIR_VOID +AC_FUNC_GETMNTENT +AC_PROG_GCC_TRADITIONAL +AC_FUNC_LSTAT +AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK +AC_FUNC_MALLOC +AC_FUNC_MEMCMP +AC_FUNC_REALLOC +AC_FUNC_STAT +AC_CHECK_FUNCS([atexit getmntent memset nl_langinfo regcomp rpmatch setlocale socket strcasecmp strchr strdup strerror strpbrk strrchr strtoul]) + +dnl Checks for Large File System +AC_SYS_LARGEFILE + +AC_CONFIG_FILES([Makefile + doc/Makefile + src/Makefile + icons/Makefile + po/Makefile.in]) +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index eee2af0..0000000 --- a/configure.in +++ /dev/null @@ -1,70 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT([psmisc],[22.4cvs]) -AC_PREREQ(2.59) -AC_CONFIG_SRCDIR([src/comm.h]) -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_LN_S - -dnl checks for options -AC_SUBST([WITH_SELINUX]) -AC_ARG_ENABLE([selinux], - [AS_HELP_STRING([--enable-selinux], [Enable Security-Enhanced Linux features])], - [enable_selinux=$enableval], - [enable_selinux="no"]) -if test "$enable_selinux" = "yes"; then - AC_DEFINE([WITH_SELINUX], [1], [Use Security-Enhanced Linux features]) - AC_CHECK_LIB([selinux], [getfilecon], [SELINUX_LIB=-lselinux], [ - AC_MSG_ERROR([Cannot find selinux static library]) ]) -fi -AC_SUBST([SELINUX_LIB]) - -dnl ipv4 only option -AC_SUBST([WITH_IPV6]) -AC_ARG_ENABLE([ipv6], - [AS_HELP_STRING([--disable-ipv6], [Disable IPv6 checks (for uClibc)])], - [enable_ipv6=$enableval], - [enable_ipv6="yes"]) -if test "$enable_ipv6" = "yes"; then - AC_DEFINE([WITH_IPV6], [1], [Use IPv6 checks]) -fi - -dnl Checks for libraries. -AC_CHECK_LIB(tinfo, tgetent, TERMCAP_LIB=-ltinfo, - AC_CHECK_LIB(ncurses, tgetent, TERMCAP_LIB=-lncurses, - AC_CHECK_LIB(termcap, tgetent, TERMCAP_LIB=-ltermcap, - AC_MSG_ERROR(Cannot find tinfo, 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]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_TYPE_UID_T - -dnl Check for language stuff -AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.14.1]) - -dnl Checks for library functions. -AC_CHECK_FUNCS([strdup strerror strtoul rpmatch]) - -dnl Checks for Large File System -AC_SYS_LARGEFILE - -AC_CONFIG_FILES([Makefile - doc/Makefile - src/Makefile - icons/Makefile - po/Makefile.in]) -AC_OUTPUT