svn commit: r355832 - in /incubator/mod_ftp/trunk: configure.in include/ftp_config.h.in

[wr...@apache.org]

Author: wrowe
Date: Sat Dec 10 16:41:56 2005
New Revision: 355832

URL: http://svn.apache.org/viewcvs?rev=355832&view=rev
Log:

  Strip more automake (may be lingering garbage in build/)

Modified:
    incubator/mod_ftp/trunk/configure.in
    incubator/mod_ftp/trunk/include/ftp_config.h.in

Modified: incubator/mod_ftp/trunk/configure.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/configure.in?rev=355832&r1=355831&r2=355832&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/configure.in (original)
+++ incubator/mod_ftp/trunk/configure.in Sat Dec 10 16:41:56 2005
@@ -1,10 +1,38 @@
 AC_INIT(src/mod_ftp.c)	
-AM_INIT_AUTOMAKE(mod_ftp, 3.0.2)
-AM_CONFIG_HEADER(include/ftp_config.h:include/ftp_config.h.in)
+AC_CONFIG_HEADER(include/ftp_config.h)
+AC_CONFIG_AUX_DIR(build)
 
-AM_MAINTAINER_MODE
-AM_PROG_LIBTOOL
+APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1)
+
+if test "$apr_found" = "no"; then
+  AC_MSG_ERROR([APR not found.  Please read the documentation.])
+fi
+
+APR_CONFIG_NICE(config.nice)
+
+dnl ## Run configure for packages Apache uses
+
+dnl shared library support for these packages doesn't currently
+dnl work on some platforms
+
+AC_CANONICAL_SYSTEM
+
+APR_SETIFNULL(CC, `$apr_config --cc`)
+APR_SETIFNULL(CPP, `$apr_config --cpp`)
+APR_ADDTO(CFLAGS, `$apr_config --cflags`)
+APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
+APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
+SHLIBPATH_VAR=`$apr_config --shlib-path-var`
+APR_BINDIR=`$apr_config --bindir`
+APR_INCLUDEDIR=`$apr_config --includedir`
+APR_VERSION=`$apr_config --version`
+APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
+
+dnl In case we picked up CC and CPP from APR, get that info into the
+dnl config cache so that PCRE uses it.  Otherwise, CC and CPP used for
+dnl PCRE and for our config tests will be whatever PCRE determines.
 AC_PROG_CC
+AC_PROG_CPP
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
@@ -16,24 +44,17 @@
 AC_PROG_GCC_TRADITIONAL
 AC_CHECK_FUNCS(fchmod)
 
-COVL_MAINTAINER_MODE
-COVL_CONFIG_NICE(config.nice)
-COVL_CHECK_APACHE20
-COVL_CHECK_PYTEST(tests)
-
 FTPDIR=`pwd`
+AC_SUBST(FTPDIR)
 
-CPPFLAGS="$CPPFLAGS $APACHE20_CPPFLAGS $APR_CPPFLAGS $APU_CPPFLAGS"
-CFLAGS="$CFLAGS $APR_CFLAGS"
+dnl various OS checks that apparently set required flags
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
 
-AIX_SHLIB_LDFLAGS="" 
-case "$host" in
-  *-ibm-aix4*|*-ibm-aix5.1*)
-    AIX_SHLIB_LDFLAGS="-Wl,-G"
-    ;;
-esac
+dnl Check for what we can generate dependency files with
+APR_CHECK_DEPEND
 
-AC_SUBST(FTPDIR)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)

Modified: incubator/mod_ftp/trunk/include/ftp_config.h.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/include/ftp_config.h.in?rev=355832&r1=355831&r2=355832&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/include/ftp_config.h.in (original)
+++ incubator/mod_ftp/trunk/include/ftp_config.h.in Sat Dec 10 16:41:56 2005
@@ -1,8 +1,5 @@
 /* include/ftp_config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
 /* Define to 1 if you have the `fchmod' function. */
 #undef HAVE_FCHMOD
 
@@ -42,9 +39,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Name of package */
-#undef PACKAGE
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -63,5 +57,19 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Version number of package */
-#undef VERSION
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE