X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=autogen.sh;h=e7847a1dbf500a463bce8565cbef846c2340d1f5;hp=a49d17b63fcde65964ba465882b7d1f1c5a1229d;hb=21964baec4fe7cf0997f75dec6a837d93f12a4c8;hpb=948eb829cc0a446afd2b2f5599a7ab903a1f3955 diff --git a/autogen.sh b/autogen.sh index a49d17b..e7847a1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh ## -## This file is part of the sigrok project. +## This file is part of the sigrok-cli project. ## ## Copyright (C) 2010 Bert Vermeulen ## @@ -21,37 +21,28 @@ 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" 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 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