diff options
Diffstat (limited to 'winsup/configure.in')
-rwxr-xr-x | winsup/configure.in | 81 |
1 files changed, 20 insertions, 61 deletions
diff --git a/winsup/configure.in b/winsup/configure.in index d252adaa6..3d89a3470 100755 --- a/winsup/configure.in +++ b/winsup/configure.in @@ -9,67 +9,19 @@ 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) INSTALL=`cd $srcdir/..; echo $(pwd)/install-sh -c` AC_PROG_INSTALL - -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. - -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 - -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 -]) - -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 - -CXXFLAGS='$(CFLAGS)' -]) - AC_CANONICAL_SYSTEM LIB_AC_PROG_CC LIB_AC_PROG_CXX +AC_LANG_C + use_cygserver='yes' AC_ARG_ENABLE(server, [ --enable-server Build a cygwin DLL which can communicate with cygserver], @@ -79,22 +31,29 @@ no) use_cygserver=;; esac ]) -SUBDIRS='cygwin w32api' -test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS" +AC_CONFIG_SUBDIRS(cygwin w32api) +if test -d $srcdir/mingw; then + AC_CONFIG_SUBDIRS(mingw) +fi 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" - test -n "$use_cygserver" -a -d $srcdir/cygserver && SUBDIRS="$SUBDIRS cygserver" - 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/subauth; then + # AC_CONFIG_SUBDIRS(subauth) + # fi + if test -n "$use_cygserver" -a -d $srcdir/cygserver; then + AC_CONFIG_SUBDIRS(cygserver) + fi + AC_CONFIG_SUBDIRS(utils doc) ;; esac -AC_CONFIG_SUBDIRS($SUBDIRS) - AC_PROG_MAKE_SET -AC_SUBST(SUBDIRS) AC_OUTPUT(Makefile) |