--- yaz-config.in	2009-05-13 09:19:32.000000000 +0200
+++ yaz-config.in.oden	2009-06-10 17:46:59.000000000 +0200
@@ -2,23 +2,7 @@
 # This file is part of the YAZ toolkit.
 # Copyright (C) 1995-2008 Index Data
 
-yazprefix=@prefix@
-yaz_echo_cflags=no
-yaz_echo_libs=no
 yaz_echo_help=no
-yaz_echo_source=yes
-yaz_echo_lalibs=no
-yaz_echo_comp=no
-yaz_src_root=@YAZ_SRC_ROOT@
-yaz_build_root=@YAZ_BUILD_ROOT@
-PTHREAD_LIBS="@PTHREAD_LIBS@"
-PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
-ICU_LIBS="@ICU_LIBS@"
-ICU_CPPFLAGS="@ICU_CPPFLAGS@"
-SSL_LIBS="@SSL_LIBS@"
-LIBS="@LIBS@"
-YAZVERSION=@VERSION@
-VERSION_SHA1=@VERSION_SHA1@
 
 usage()
 {
@@ -44,47 +28,29 @@
     esac
     
     case $1 in
-	--prefix=*)
-	    yazprefix=$optarg
-	    ;;
 	--prefix)
-	    echo $yazprefix
+ 	    echo "@prefix@"
 	    exit 0
 	    ;;
         -V)
-	    echo "$YAZVERSION $VERSION_SHA1"
+	    echo "@VERSION_SHA1@"
 	    exit 0
             ;;
 	--version)
-	    echo $YAZVERSION
+ 	    echo "@VERSION@"
 	    exit 0
 	    ;;
 	--cflags)
-	    yaz_echo_cflags=yes
+ 	    echo "-I@includedir@ @YAZ_CONFIG_CFLAGS@ @PTHREAD_CFLAGS@ @ICU_CPPFLAGS@"
 	    ;;
 	--libs)
-	    yaz_echo_libs=yes
+ 	    echo "-L@libdir@ -lyaz @SSL_LIBS@ @LIBS@ @ICU_LIBS@"
 	    ;;
 	--lalibs)
-	    yaz_echo_lalibs=yes
+ 	    echo "@libdir@/libyaz.la @SSL_LIBS@ @LIBS@ @ICU_LIBS@"
 	    ;;
 	--comp)
-	    yaz_echo_comp=yes
-	    ;;
-	threads)
-	    lib_thread=yes
-	    ;;
-	icu)
-	    if test "$ICU_CPPFLAGS"; then
-		lib_icu=yes
-	    fi
-	    ;;
-	server)
-	    lib_thread=yes
-	    lib_server=yes
-	    ;;
-	static)
-	    lib_static=yes
+ 	    echo "@bindir@/yaz-asncomp"
 	    ;;
 	-*)
 	    yaz_echo_help=yes
@@ -92,86 +58,9 @@
     esac
     shift
 done
-
-lyaz="-lyaz"
-if test "$lib_server" = "yes"; then
-    lyaz="-lyaz_server $lyaz"
-fi
-
-if test "$lib_icu" = "yes"; then
-    lyaz="-lyaz_icu $lyaz"
-fi
-
-YAZINC="@YAZ_CONFIG_CFLAGS@"
-
-if test "$yaz_echo_source" = "yes"; then
-    YAZBIN=${yaz_build_root}/bin
-
-    if test "$lib_static" = "yes"; then
-        YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
-        if test "$lib_server" = "yes"; then
-    	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
-        fi
-        if test "$lib_icu" = "yes"; then
-    	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
-        fi
-    else
-        YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
-    fi
-    YAZLIB="$YAZLIB ${SSL_LIBS} $LIBS"
-
-    YAZLALIB="${yaz_build_root}/src/libyaz.la"
-    if test "$lib_server" = "yes"; then
-	YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
-    fi
-    if test "$lib_icu" = "yes"; then
-	YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
-    fi
-    YAZLALIB="$YAZLALIB $LIBS"
-
-    YAZINC="-I${yaz_src_root}/include $YAZINC"
-    YAZCOMP=${yaz_src_root}/util/yaz-asncomp
-else
-    YAZBIN=${yazprefix}/bin
-    YAZCOMP=${yazprefix}/bin/yaz-asncomp
-
-    if test "$yazprefix" != "/usr"; then
-	YAZLIB="-L$yazprefix/lib"
-    fi
-    YAZLIB="$YAZLIB $lyaz ${SSL_LIBS} $LIBS"
-    YAZLALIB=$YAZLIB
-    if test "$yazprefix" != "/usr"; then
-	YAZINC="-I$yazprefix/include $YAZINC"
-    fi
-fi
-
-if test "$lib_thread" = "yes"; then
-    YAZINC="$PTHREAD_CFLAGS $YAZINC"
-    YAZLIB="$YAZLIB $PTHREAD_LIBS"
-    YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
-fi
-
-if test "$lib_icu" = "yes"; then
-    YAZINC="$YAZINC $ICU_CPPFLAGS"
-    YAZLIB="$YAZLIB $ICU_LIBS"
-    YAZLALIB="$YAZLALIB $ICU_LIBS"
-fi
-
 if test "$yaz_echo_help" = "yes"; then
     usage 1 1>&2
 fi
-if test "$yaz_echo_cflags" = "yes"; then
-    echo $YAZINC
-fi
-if test "$yaz_echo_libs" = "yes"; then
-    echo $YAZLIB
-fi
-if test "$yaz_echo_lalibs" = "yes"; then
-    echo $YAZLALIB
-fi
-if test "$yaz_echo_comp" = "yes"; then
-    echo $YAZCOMP
-fi
 # Local Variables:
 # mode:shell-script
 # sh-indentation: 2