Refactor scan options check.

[libsigrok.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 0f4a777151203c1321b3e493a0d19f92b91b0aa1..f683d318efbcf14d074abebd7ece39820a77ab57 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -32,12 +32,22 @@ if [ "x$OS" = "xDarwin" ]; then
        elif [ -d /opt/local/share/aclocal ]; then
                # Macports installs aclocal macros here
                ACLOCAL_DIR="-I /opt/local/share/aclocal"
+       elif [ -d /usr/local/share/aclocal ]; then
+               # Homebrew installs aclocal macros here
+               ACLOCAL_DIR="-I /usr/local/share/aclocal"
        elif [ -d /usr/share/aclocal ]; 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
 
@@ -45,6 +55,6 @@ echo "Generating build system..."
 ${LIBTOOLIZE} --install --copy --quiet || exit 1
 aclocal ${ACLOCAL_DIR} || exit 1
 autoheader || exit 1
-automake --add-missing --copy --foreign || exit 1
+automake --add-missing --copy || exit 1
 autoconf || exit 1