From c357abd198bd195cb9ea015130dc76c8c7a33651 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 7 Apr 2015 02:36:47 +0200 Subject: [PATCH 1/1] autogen.sh: Drop obsolete MinGW/MSYS items. For Windows builds (which require MinGW-w64) we currently support: - cross-builds using MXE (mxe.cc) and possibly other cross-compile setups - native builds using MSYS2 (sf.net/projects/msys2/) Neither of those require explicitly specifying ACLOCAL_DIR. --- autogen.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/autogen.sh b/autogen.sh index 7cdf22f..93441ed 100755 --- a/autogen.sh +++ b/autogen.sh @@ -21,11 +21,9 @@ OS=`uname` LIBTOOLIZE=libtoolize -ACLOCAL_DIR= if [ "x$OS" = "xDarwin" ]; then LIBTOOLIZE=glibtoolize - if [ -d /sw/share/aclocal ]; then # fink installs aclocal macros here ACLOCAL_DIR="-I /sw/share/aclocal" @@ -39,16 +37,6 @@ if [ "x$OS" = "xDarwin" ]; then # Xcode installs aclocal macros here ACLOCAL_DIR="-I /usr/share/aclocal" fi - -elif [ "x$OS" = "xMINGW32_NT-5.1" ]; then - # Windows XP - ACLOCAL_DIR="-I /usr/local/share/aclocal" -elif [ "x$OS" = "xMINGW32_NT-6.0" ]; then - # Windows Vista - ACLOCAL_DIR="-I /usr/local/share/aclocal" -elif [ "x$OS" = "xMINGW32_NT-6.1" ]; then - # Windows 7 - ACLOCAL_DIR="-I /usr/local/share/aclocal" fi echo "Generating build system..." -- 2.30.2