autogen.sh: Drop obsolete MinGW/MSYS items.
authorUwe Hermann <uwe@hermann-uwe.de>
Tue, 7 Apr 2015 00:38:39 +0000 (02:38 +0200)
committerUwe Hermann <uwe@hermann-uwe.de>
Tue, 7 Apr 2015 00:38:39 +0000 (02:38 +0200)
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

index 9c29256169152c3c9fecbaa3f25cd59ab10e9711..e7847a1dbf500a463bce8565cbef846c2340d1f5 100755 (executable)
 OS=`uname`
 
 LIBTOOLIZE=libtoolize
 OS=`uname`
 
 LIBTOOLIZE=libtoolize
-ACLOCAL_DIR=
 
 if [ "x$OS" = "xDarwin" ]; then
        LIBTOOLIZE=glibtoolize
 
 if [ "x$OS" = "xDarwin" ]; then
        LIBTOOLIZE=glibtoolize
-
        if [ -d /sw/share/aclocal ]; then
                # fink installs aclocal macros here
                ACLOCAL_DIR="-I /sw/share/aclocal"
        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
                # 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..."
 fi
 
 echo "Generating build system..."