Generalise makefile references to subdirectories of lib.

[pf3gnuchains/pf3gnuchains4x.git] / winsup / configure.in

diff --git a/winsup/configure.in b/winsup/configure.in
index 3cf3284..c40d3d2 100755 (executable)
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -1,5 +1,6 @@
 dnl Autoconf configure script for Cygwin.
-dnl Copyright 1996, 1997, 1998, 1999, 2000 Red Hat, Inc.
+dnl Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006,
+dnl 2009 Red Hat, Inc.
 dnl
 dnl This file is part of Cygwin.
 dnl
@@ -9,78 +10,60 @@ dnl details.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.12)dnl
+AC_PREREQ(2.59)dnl
 AC_INIT(Makefile.in)
 
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
+INSTALL=`cd $srcdir/..; echo $(pwd)/install-sh -c`
 
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
+AC_PROG_INSTALL
+AC_CANONICAL_SYSTEM
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
+GCC_NO_EXECUTABLES
 
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CXX, g++, g++)
-if test -z "$CXX"; then
-  AC_CHECK_PROG(CXX, c++, c++, , , )
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
+LIB_AC_PROG_CC
+LIB_AC_PROG_CXX
 
-CXXFLAGS='$(CFLAGS)'
-])
+AC_LANG_C
 
-AC_CANONICAL_SYSTEM
+INSTALL_LICENSE=
 
-LIB_AC_PROG_CC
-LIB_AC_PROG_CXX
+case "$target" in
+  *cygwin*)
+    if ! test -d $srcdir/cygwin; then
+      AC_MSG_ERROR("No cygwin dir.  Can't build Cygwin.  Exiting...")
+    fi
+    AC_CONFIG_SUBDIRS(cygwin)
+    INSTALL_LICENSE="install-license"
+    ;;
+  *mingw*)
+    if ! test -d $srcdir/mingw; then
+      AC_MSG_ERROR("No mingw dir.  Can't build Mingw.  Exiting...")
+    fi
+    ;;
+esac
 
-SUBDIRS='cygwin w32api'
-test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
+if test -d $srcdir/mingw; then
+  AC_CONFIG_SUBDIRS(mingw)
+fi
+AC_CONFIG_SUBDIRS(w32api cygserver)
 
 case "$with_cross_host" in
   ""|*cygwin*)
-    # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
-    # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
-    # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
-    SUBDIRS="$SUBDIRS utils doc"
+    # if test -d $srcdir/bz2lib; then
+    #  AC_CONFIG_SUBDIRS(bz2lib)
+    # fi
+    # if test -d $srcdir/zlib; then
+    #   AC_CONFIG_SUBDIRS(zlib)
+    # fi
+    if test -d $srcdir/lsaauth; then
+      AC_CONFIG_SUBDIRS(lsaauth)
+    fi
+    AC_CONFIG_SUBDIRS(utils doc)
     ;;
 esac
 
-AC_CONFIG_SUBDIRS($SUBDIRS)
+AC_SUBST(INSTALL_LICENSE)
 
 AC_PROG_MAKE_SET
 
-AC_SUBST(SUBDIRS)
 AC_OUTPUT(Makefile)