# look for getconf early as this affects just about everything
AC_CHECK_PROG(HAVE_GETCONF, getconf, "yes", "no")
if test $HAVE_GETCONF = "yes"; then
# look for getconf early as this affects just about everything
AC_CHECK_PROG(HAVE_GETCONF, getconf, "yes", "no")
if test $HAVE_GETCONF = "yes"; then
AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH)
AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH)
-AC_CONFIG_SUBDIRS(popt-1.2)
-AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
+if test x"$with_included_popt" != x"yes"
+then
+ AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
+fi
- AC_MSG_RESULT("$srcdir/popt-1.2")
- BUILD_LIBPOPT=popt-1.2/libpopt.a
- LDFLAGS="$CFLAGS -L popt-1.2"
- CFLAGS="$CFLAGS -I $srcdir/popt-1.2"
+ AC_MSG_RESULT("$srcdir/popt")
+ BUILD_POPT='$(popt_OBJS)'
+ CFLAGS="$CFLAGS -I $srcdir/popt"