From cd4b413cb0574c459c1c24cf07f8d6b44f5fc077 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 22 May 2013 12:23:20 +1000 Subject: build: Remove autoconf build system We are now confident that that waf build system meets enough of our needs that we will work to improve it, rather than maintain two build systems. Andrew Bartlett Reviewed-by: Jelmer Vernooij Reviewed-by: David Disseldorp --- lib/popt/libpopt.m4 | 43 ------------------------------------------- lib/popt/samba.m4 | 8 -------- 2 files changed, 51 deletions(-) delete mode 100644 lib/popt/libpopt.m4 delete mode 100644 lib/popt/samba.m4 (limited to 'lib/popt') diff --git a/lib/popt/libpopt.m4 b/lib/popt/libpopt.m4 deleted file mode 100644 index cfa2eaad23..0000000000 --- a/lib/popt/libpopt.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Check to see if we should use the included popt - -INCLUDED_POPT=auto -AC_ARG_WITH(included-popt, -[ --with-included-popt use bundled popt library, not from system], -[ INCLUDED_POPT=$withval ]) - -AC_SUBST(POPT_LIBS) -AC_SUBST(POPT_CFLAGS) - -if test x"$INCLUDED_POPT" != x"yes"; then - AC_CHECK_HEADERS(popt.h) - AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ]) - if test x"$ac_cv_header_popt_h" = x"no" -o x"$ac_cv_lib_popt_poptGetContext" = x"no"; then - INCLUDED_POPT=yes - POPT_CFLAGS="" - else - INCLUDED_POPT=no - fi -fi - -AC_MSG_CHECKING(whether to use included popt) -AC_MSG_RESULT($INCLUDED_POPT) -if test x"$INCLUDED_POPT" != x"no"; then - dnl find the popt sources. This is meant to work both for - dnl popt standalone builds, and builds of packages using popt - poptdir="" - poptpaths="$srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt $srcdir/../lib/popt" - for d in $poptpaths; do - if test -f "$d/popt.c"; then - poptdir="$d" - POPT_CFLAGS="-I$d" - AC_SUBST(poptdir) - break - fi - done - if test x"$poptdir" = "x"; then - AC_MSG_ERROR([cannot find popt source in $poptpaths]) - fi - POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o" - AC_SUBST(POPT_OBJ) - AC_CHECK_HEADERS([float.h alloca.h]) -fi diff --git a/lib/popt/samba.m4 b/lib/popt/samba.m4 deleted file mode 100644 index 627dd854b2..0000000000 --- a/lib/popt/samba.m4 +++ /dev/null @@ -1,8 +0,0 @@ -m4_include(../lib/popt/libpopt.m4) - -if test x"$POPT_OBJ" = "x"; then - SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}]) -else - SMB_INCLUDE_MK(../lib/popt/config.mk) -fi - -- cgit