diff options
Diffstat (limited to 'winsup/mingw/configure.in')
-rw-r--r-- | winsup/mingw/configure.in | 52 |
1 files changed, 3 insertions, 49 deletions
diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in index b493b4831..72a606106 100644 --- a/winsup/mingw/configure.in +++ b/winsup/mingw/configure.in @@ -16,49 +16,9 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_PREREQ(2.12) +AC_PREREQ(2.59) AC_INIT(dllmain.c) - -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 - if test "$ac_test_CXXFLAGS" != set; then - CXXFLAGS='$(CFLAGS)' - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi -]) +AC_CONFIG_AUX_DIR(../..) LIB_AC_PROG_CC @@ -88,8 +48,7 @@ AC_SUBST(WINDRES) AC_ALLOCA AC_CANONICAL_SYSTEM -SUBDIRS="profile mingwex" -configdirs="profile mingwex" +AC_CONFIG_SUBDIRS(profile mingwex) HEADER_SUBDIR="" LIBGMON_A=libgmon.a @@ -117,17 +76,12 @@ esac # to match the libmingwthrd.a name. THREAD_DLL=mingwm -if test -n "$configdirs"; then - AC_CONFIG_SUBDIRS($configdirs) -fi - MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs AC_SUBST(MKINSTALLDIRS) AC_SUBST(MNO_CYGWIN) AC_SUBST(THREAD_DLL) AC_SUBST(LIBM_A) AC_SUBST(LIBGMON_A) -AC_SUBST(SUBDIRS) AC_SUBST(HEADER_SUBDIR) AC_SUBST(W32API_INCLUDE) |