Emacs shell-script for these.
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 13 Jun 2006 15:36:09 +0000 (15:36 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 13 Jun 2006 15:36:09 +0000 (15:36 +0000)
configure.ac
yaz-config.in

index d1ed824..1d1c580 100644 (file)
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.23 2006-06-09 13:29:21 adam Exp $
+dnl $Id: configure.ac,v 1.24 2006-06-13 15:36:09 adam Exp $
 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.21],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -27,7 +27,7 @@ dnl ------ Headers
 AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h sys/wait.h unistd.h)
 AC_HEADER_STDC
 if test "$ac_cv_header_stdc" = "no"; then
-       AC_MSG_WARN(Your system doesn't seem to support ANSI C)
+    AC_MSG_WARN([Your system doesn not seem to support ANSI C])
 fi
 dnl ----- Types
 AC_CHECK_TYPES([long long])
@@ -36,12 +36,12 @@ dnl ----- Sockets
 checkBoth=0
 AC_CHECK_FUNC(connect)
 if test "$ac_cv_func_connect" = "no"; then
-       AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
+    AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
 fi
 if test "$checkBoth" = "1"; then
-       oldLibs=$LIBS
-       LIBS="$LIBS -lsocket -lnsl"
-       AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
+    oldLibs=$LIBS
+    LIBS="$LIBS -lsocket -lnsl"
+    AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
 fi
 AC_CHECK_FUNC(gethostbyname, ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
 dnl
@@ -52,136 +52,136 @@ AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [o
 SSL_CFLAGS=""
 SSL_LIBPATH=""
 if test "$openssl" != "no"; then
-       sslver=no
-       if test "$openssl" != "yes" -a "$openssl" != "default"; then
-               if test -x $openssl/bin/pkg-config; then
-                       if $openssl/bin/pkg-config --exists openssl; then
-                               SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
-                               LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
-                               sslver=`$openssl/bin/pkg-config --modversion openssl`
-                       fi
-               fi
-               if test "$sslver" = "no"; then
-                       SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-                       SSL_LIBPATH="-L$openssl/lib"
-               fi
-       else
-               if test "$pkgconfigpath" != "NONE"; then
-                       if $pkgconfigpath --exists openssl; then
-                               SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
-                               LIBS="$LIBS `$pkgconfigpath --libs openssl`"
-                               sslver=`$pkgconfigpath --modversion openssl`
-                       fi
-               fi
-               if test "$sslver" = "no"; then
-                       SSL_CFLAGS="-I/usr/include/openssl"
-               fi
+    sslver=no
+    if test "$openssl" != "yes" -a "$openssl" != "default"; then
+       if test -x $openssl/bin/pkg-config; then
+           if $openssl/bin/pkg-config --exists openssl; then
+               SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+               LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
+               sslver=`$openssl/bin/pkg-config --modversion openssl`
+           fi
        fi
        if test "$sslver" = "no"; then
-               xLIBS="$LIBS";
-               xCPPFLAGS="$CPPFLAGS";
-               CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
-               AC_CHECK_LIB(crypto, main)
-               AC_CHECK_LIB(ssl, SSL_new)
-               if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-                       AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
-                       LIBS="$SSL_LIBPATH $LIBS"
-               fi
-               if test "$sslver" != "yes"; then
-                       LIBS="$xLIBS"
-               fi
-               CPPFLAGS="$xCPPFLAGS"
+           SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
+           SSL_LIBPATH="-L$openssl/lib"
        fi
-       AC_MSG_CHECKING([for SSL])
-       if test "$sslver" != "no"; then
-               SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
-               AC_MSG_RESULT([$sslver])
-       else
-               SSL_CFLAGS=""
-               AC_MSG_RESULT([None])
-               if test "$openssl" != "default"; then
-                       AC_MSG_ERROR([OpenSSL development libraries missing])
-               fi
+    else
+       if test "$pkgconfigpath" != "NONE"; then
+           if $pkgconfigpath --exists openssl; then
+               SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
+               LIBS="$LIBS `$pkgconfigpath --libs openssl`"
+               sslver=`$pkgconfigpath --modversion openssl`
+           fi
        fi
+       if test "$sslver" = "no"; then
+           SSL_CFLAGS="-I/usr/include/openssl"
+       fi
+    fi
+    if test "$sslver" = "no"; then
+       xLIBS="$LIBS";
+       xCPPFLAGS="$CPPFLAGS";
+       CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
+       AC_CHECK_LIB(crypto, main)
+       AC_CHECK_LIB(ssl, SSL_new)
+       if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+           AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
+           LIBS="$SSL_LIBPATH $LIBS"
+       fi
+       if test "$sslver" != "yes"; then
+           LIBS="$xLIBS"
+       fi
+       CPPFLAGS="$xCPPFLAGS"
+    fi
+    AC_MSG_CHECKING([for SSL])
+    if test "$sslver" != "no"; then
+       SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+       AC_MSG_RESULT([$sslver])
+    else
+       SSL_CFLAGS=""
+       AC_MSG_RESULT([None])
+       if test "$openssl" != "default"; then
+           AC_MSG_ERROR([OpenSSL development libraries missing])
+       fi
+    fi
 fi
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
 AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
-       AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
+    AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
 )
 READLINE_LIBS=""
 AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
 AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
-       AC_CHECK_HEADERS(readline/readline.h readline/history.h)
-        xLIBS=$LIBS
-        LIBS="$LIBS $READLINE_LIBS"
-        AC_TRY_LINK([
+    AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+    xLIBS=$LIBS
+    LIBS="$LIBS $READLINE_LIBS"
+    AC_TRY_LINK([
        #include <stdio.h>
        #include <readline/readline.h>
-       ],[
-                rl_attempted_completion_over = 0;
-        ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
-        AC_TRY_LINK([
+           ],[
+           rl_attempted_completion_over = 0;
+           ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
+    AC_TRY_LINK([
        #include <stdio.h>
        #include <readline/readline.h>
-       ],[
-                rl_completion_matches (0, 0);
-        ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
-        LIBS=$xLIBS
+           ],[
+           rl_completion_matches (0, 0);
+           ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
+    LIBS=$xLIBS
 fi
 dnl ------ iconv
 AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]     iconv library in PREFIX])
 if test "$with_iconv" != "no"; then
-        AC_MSG_CHECKING(for iconv)
-       oldLIBS="$LIBS"
-               oldCPPFLAGS="${CPPFLAGS}"
-       if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
-               LIBS="$LIBS -L${with_iconv}/lib"
-                       CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include"
-       fi
-        AC_TRY_LINK([
+    AC_MSG_CHECKING(for iconv)
+    oldLIBS="$LIBS"
+    oldCPPFLAGS="${CPPFLAGS}"
+    if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
+       LIBS="$LIBS -L${with_iconv}/lib"
+       CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include"
+    fi
+    AC_TRY_LINK([
                #include <iconv.h>
-       ],[
-               iconv_t t = iconv_open("", "");
-       ],[
-               AC_DEFINE(HAVE_ICONV_H)
-               AC_MSG_RESULT(yes)
-       ],[
-               LIBS="$LIBS -liconv"
-               AC_TRY_LINK([
+           ],[
+           iconv_t t = iconv_open("", "");
+           ],[
+           AC_DEFINE(HAVE_ICONV_H)
+           AC_MSG_RESULT(yes)
+           ],[
+           LIBS="$LIBS -liconv"
+           AC_TRY_LINK([
                        #include <iconv.h>
-               ],[
-                       iconv_t t = iconv_open("", "");
-               ],[
-                       AC_DEFINE(HAVE_ICONV_H)
-                       AC_MSG_RESULT(yes)
-               ],[
-                       LIBS="$oldLIBS"
-                       CPPFLAGS="$oldCPPFLAGS"
-                       AC_MSG_RESULT(no)
-               ])
-       ])
+                   ],[
+           iconv_t t = iconv_open("", "");
+                   ],[
+           AC_DEFINE(HAVE_ICONV_H)
+           AC_MSG_RESULT(yes)
+                   ],[
+           LIBS="$oldLIBS"
+           CPPFLAGS="$oldCPPFLAGS"
+           AC_MSG_RESULT(no)
+           ])
+    ])
 fi
 dnl ------ various functions
 AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
 case $host in
-*-*-darwin*)
+    *-*-darwin*)
        trypoll="no";
-               ;;
-*)
+       ;;
+    *)
        trypoll="yes";
        ;;
 esac
 
 if test "$ac_cv_func_poll" = "yes" -a "$trypoll" = "yes"; then
-        AC_CHECK_HEADERS(sys/poll.h)
+    AC_CHECK_HEADERS(sys/poll.h)
 fi
 dnl ------ socklen_t
 dnl We check for socklen_t by making prototypes with the
 dnl various types. First socklen_t, then size_t, finally int.
-dnl If the prototype succeeds, we're probably safe.
+dnl If the prototype succeeds, we are probably safe.
 dnl That works if accept is not preprocessor defined (such sa AIX)
 AC_MSG_CHECKING([for socklen_t])
 AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
@@ -222,9 +222,9 @@ extern int accept(int, struct sockaddr *, size_t t *);
 #ifdef __cplusplus
 }
 #endif
-               ],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
+],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
+               ])
        ])
-])
 AC_MSG_RESULT($ac_cv_check_socklen_t)
 AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
 AC_DEFINE(YAZ_USE_NEW_LOG)
@@ -232,30 +232,30 @@ dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
 if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
-       oldLibs=$LIBS
-       oldCPPFLAGS=$CPPFLAGS
-       if test "$enable_tcpd" != "yes"; then
-               LIBS="$LIBS -L$enable_tcpd/lib"
-               CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
-       fi
-       AC_MSG_CHECKING(for working tcpd.h)
-       LIBS="$LIBS -lwrap -lnsl"
-       AC_TRY_LINK([#include <syslog.h>
+    oldLibs=$LIBS
+    oldCPPFLAGS=$CPPFLAGS
+    if test "$enable_tcpd" != "yes"; then
+       LIBS="$LIBS -L$enable_tcpd/lib"
+       CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
+    fi
+    AC_MSG_CHECKING(for working tcpd.h)
+    LIBS="$LIBS -lwrap -lnsl"
+    AC_TRY_LINK([#include <syslog.h>
 #include <tcpd.h>
-       int allow_severity = LOG_INFO;
-       int deny_severity = LOG_WARNING;],
+           int allow_severity = LOG_INFO;
+           int deny_severity = LOG_WARNING;],
        [struct request_info request_info; int i;
-       i = hosts_access(&request_info);],
+           i = hosts_access(&request_info);],
        tcpd_ok=1, tcpd_ok=0)
-       if test "$tcpd_ok" = "0"; then
-               AC_MSG_RESULT(no)
-               AC_MSG_ERROR([tcpd development libraries missing])
+    if test "$tcpd_ok" = "0"; then
+       AC_MSG_RESULT(no)
+       AC_MSG_ERROR([tcpd development libraries missing])
                LIBS=$oldLibs
                CPPFLAGS=$oldCPPFLAGS
-       else
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_TCPD_H)
-       fi
+    else
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_TCPD_H)
+    fi
 fi
 dnl
 AC_SUBST(THREAD_CFLAGS)
@@ -267,57 +267,57 @@ dnl ------ GNU threads
 AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
 AC_SUBST(LIBPTH)
 if test "$enable_pth" = "yes"; then
-       OLIBS=$LIBS
-       AC_CHECK_LIB(pth,main)
-       if test "$ac_cv_lib_pth_main" = "yes"; then
-               AC_CHECK_HEADERS(pth.h)
-               if test "$ac_cv_header_pth_h" = "yes"; then
-                       LIBTHREAD="-lpth"
-                       THREAD_CFLAGS="-DYAZ_GNU_THREADS=1"
-                       HAVETHREADS=1
-               fi
-       fi      
-       LIBS="$OLIBS $LIBTHREAD"
+    OLIBS=$LIBS
+    AC_CHECK_LIB(pth,main)
+    if test "$ac_cv_lib_pth_main" = "yes"; then
+       AC_CHECK_HEADERS(pth.h)
+       if test "$ac_cv_header_pth_h" = "yes"; then
+           LIBTHREAD="-lpth"
+           THREAD_CFLAGS="-DYAZ_GNU_THREADS=1"
+           HAVETHREADS=1
+       fi
+    fi 
+    LIBS="$OLIBS $LIBTHREAD"
 fi
 dnl
 dnl ------ POSIX Threads
 AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
-       OLIBS=$LIBS
-       OCC=$CC
-       AC_CHECK_LIB(pthread,main)
-       AC_MSG_CHECKING(for working POSIX Threads)
+    OLIBS=$LIBS
+    OCC=$CC
+    AC_CHECK_LIB(pthread,main)
+    AC_MSG_CHECKING(for working POSIX Threads)
+    AC_TRY_LINK([#include <pthread.h>
+           void *func(void *p) { return 0; }
+           ],[
+           pthread_t pthread_id;
+           pthread_create (&pthread_id, 0, func, 0);],
+       thread_ok=yes,thread_ok=no)
+    if test "$thread_ok" = "yes"; then
+       AC_MSG_RESULT(yes)
+       LIBTHREAD="-lpthread"
+       THREAD_CFLAGS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+       HAVETHREADS=1
+    else
+       CC="$CC -pthread"
        AC_TRY_LINK([#include <pthread.h>
-       void *func(void *p) { return 0; }
-       ],[
-       pthread_t pthread_id;
-       pthread_create (&pthread_id, 0, func, 0);],
-               thread_ok=yes,thread_ok=no)
+               void *func(void *p) { return 0; }
+               ],[
+               pthread_t pthread_id;
+               pthread_create (&pthread_id, 0, func, 0);],
+           thread_ok=yes,thread_ok=no)
        if test "$thread_ok" = "yes"; then
-               AC_MSG_RESULT(yes)
-               LIBTHREAD="-lpthread"
-               THREAD_CFLAGS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
-               HAVETHREADS=1
-       else
-               CC="$CC -pthread"
-               AC_TRY_LINK([#include <pthread.h>
-                       void *func(void *p) { return 0; }
-                       ],[
-                       pthread_t pthread_id;
-                       pthread_create (&pthread_id, 0, func, 0);],
-                       thread_ok=yes,thread_ok=no)
-               if test "$thread_ok" = "yes"; then
-                       AC_MSG_RESULT([yes,BSD])
-                       THREAD_CFLAGS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
-                       LIBTHREAD="-pthread"
-                       HAVETHREADS=1
-               fi
-       fi
-       if test "$thread_ok" = "no"; then
-               AC_MSG_RESULT(no)
+           AC_MSG_RESULT([yes,BSD])
+           THREAD_CFLAGS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+           LIBTHREAD="-pthread"
+           HAVETHREADS=1
        fi
-       CC=$OCC
-       LIBS="$OLIBS $LIBTHREAD"
+    fi
+    if test "$thread_ok" = "no"; then
+       AC_MSG_RESULT(no)
+    fi
+    CC=$OCC
+    LIBS="$OLIBS $LIBTHREAD"
 fi
 
 dnl ----- libXSLT/libEXLT/libXML2
@@ -328,16 +328,16 @@ YAZ_LIBXSLT
 YAZ_LIBEXSLT
 
 if test "$XML2_LIBS"; then
-       LIBS="$XML2_LIBS $LIBS"
+    LIBS="$XML2_LIBS $LIBS"
 fi
 
 dnl
 dnl ------ Memory debugging
 AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
 if test "$enable_memdebug" = "yes"; then
-       AC_DEFINE(TRACE_XMALLOC,2)
+    AC_DEFINE(TRACE_XMALLOC,2)
 elif test "$enable_memdebug" = "no"; then
-       AC_DEFINE(TRACE_XMALLOC,0)
+    AC_DEFINE(TRACE_XMALLOC,0)
 fi
 dnl
 dnl ------ Using this for "in-source" yaz-config
@@ -369,19 +369,6 @@ Doxyfile
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
 
 
-echo \ '
-Build and install binaries with the usual
-  make
-  make check
-  make install
-
-Build distribution tarball with
-  make dist
-
-Verify distribution tarball with
-  make distcheck
-'
-
 echo \
 "------------------------------------------------------------------------
 Configuration:
@@ -403,3 +390,8 @@ Configuration:
   Ranlib:                     ${RANLIB}
 
 ------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End:
index 1b2560f..d2325ab 100644 (file)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.23 2005-09-09 10:34:09 adam Exp $
+# $Id: yaz-config.in,v 1.24 2006-06-13 15:36:09 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -15,7 +15,7 @@ YAZVERSION=@VERSION@
 
 usage()
 {
-       cat <<EOF
+    cat <<EOF
 Usage: yaz-config [OPTIONS] [LIBRARIES]
 Options:
        [--prefix[=DIR]]
@@ -30,51 +30,47 @@ EOF
        exit $1
 }
 
-#if test $# -eq 0; then
-#      yaz_echo_help=yes
-#fi
-
 while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      yazprefix=$optarg
-      ;;
-    --prefix)
-      echo $yazprefix
-      exit 0
-      ;;
-    --version)
-      echo $YAZVERSION
-      exit 0
-      ;;
-    --cflags)
-      yaz_echo_cflags=yes
-      ;;
-    --libs)
-      yaz_echo_libs=yes
-      ;;
-    --lalibs)
-      yaz_echo_lalibs=yes
-      ;;
-    --comp)
-      yaz_echo_comp=yes
-      ;;
-    threads)
-      lib_thread=yes
-      ;;
-    malloc)
-      lib_malloc=yes
-      ;;
-    -*)
-      yaz_echo_help=yes
-      ;;
-  esac
-  shift
+    case "$1" in
+       -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+       *) optarg= ;;
+    esac
+    
+    case $1 in
+       --prefix=*)
+           yazprefix=$optarg
+           ;;
+       --prefix)
+           echo $yazprefix
+           exit 0
+           ;;
+       --version)
+           echo $YAZVERSION
+           exit 0
+           ;;
+       --cflags)
+           yaz_echo_cflags=yes
+           ;;
+       --libs)
+           yaz_echo_libs=yes
+           ;;
+       --lalibs)
+           yaz_echo_lalibs=yes
+           ;;
+       --comp)
+           yaz_echo_comp=yes
+           ;;
+       threads)
+           lib_thread=yes
+           ;;
+       malloc)
+           lib_malloc=yes
+           ;;
+       -*)
+           yaz_echo_help=yes
+           ;;
+    esac
+    shift
 done
 
 lyaz="-lyaz"
@@ -109,17 +105,22 @@ if test "$lib_thread" = "yes"; then
 fi
 
 if test "$yaz_echo_help" = "yes"; then
-       usage 1 1>&2
+    usage 1 1>&2
 fi
 if test "$yaz_echo_cflags" = "yes"; then
-       echo $YAZINC
+    echo $YAZINC
 fi
 if test "$yaz_echo_libs" = "yes"; then
-       echo $YAZLIB
+    echo $YAZLIB
 fi
 if test "$yaz_echo_lalibs" = "yes"; then
-       echo $YAZLALIB
+    echo $YAZLALIB
 fi
 if test "$yaz_echo_comp" = "yes"; then
-       echo $YAZCOMP
+    echo $YAZCOMP
 fi
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End: