Pass unitsize to srd_session_send() directly.

[sigrok-cli.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 8185af0ff59805251307db641375ef434859b667..e7847a1dbf500a463bce8565cbef846c2340d1f5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##
 #!/bin/sh
 ##

-## This file is part of the sigrok project.
+## This file is part of the sigrok-cli project.

 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##


@@ -21,11 +21,9 @@
 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,22 +37,12 @@ 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..."
 ${LIBTOOLIZE} --install --copy --quiet || exit 1
 aclocal ${ACLOCAL_DIR} || exit 1
 autoheader || exit 1
 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
 
 autoconf || exit 1