ncurses 5.7 - patch 20090105

+ remove undeveloped feature in ncurses-config.in for setting
  prefix variable.
+ recent change to ncurses-config.in did not take into account the
  --disable-overwrite option, which sets $includedir to the
  subdirectory and using just that for a -I option does not work - fix
  (report by Frederic L W Meunier).

diff --git a/NEWS b/NEWS
index b8f6f3d6b26bff90fbaa56bbad3941b266b27dc1..48e18321ba5818d69c28293f2fea34066d30c6fa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.1351 2009/01/04 22:43:22 tom Exp $
+-- $Id: NEWS,v 1.1353 2009/01/06 00:26:35 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20090105
+       + remove undeveloped feature in ncurses-config.in for setting
+         prefix variable.
+       + recent change to ncurses-config.in did not take into account the
+         --disable-overwrite option, which sets $includedir to the
+         subdirectory and using just that for a -I option does not work - fix
+         (report by Frederic L W Meunier).
+

 20090104
        + modify gen-pkgconfig.in to eliminate a dependency on rpath when
          deciding whether to add $LIBS to --libs output; that should be shown
 20090104
        + modify gen-pkgconfig.in to eliminate a dependency on rpath when
          deciding whether to add $LIBS to --libs output; that should be shown

diff --git a/configure b/configure
index 92e5a0ff51cc75f085262da6e3201adaad2db601..1b0599f693fd67c6aa3492a1c910c08f6280a5ca 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.461 .
+# From configure.in Revision: 1.463 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20081225.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20081225.
 #


@@ -16891,6 +16891,7 @@ if test "$NCURSES_LIBUTF8" = 1 ; then
 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
 fi
 fi
 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
 fi
 fi

+WITH_OVERWRITE=$with_overwrite

 
 # used to separate tack out of the tree
 NCURSES_TREE=
 
 # used to separate tack out of the tree
 NCURSES_TREE=


@@ -16903,7 +16904,7 @@ EOF
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 

-echo "$as_me:16906: checking for src modules" >&5
+echo "$as_me:16907: checking for src modules" >&5

 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs


@@ -16966,7 +16967,7 @@ EOF
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:16969: result: $cf_cv_src_modules" >&5
+echo "$as_me:16970: result: $cf_cv_src_modules" >&5

 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"


@@ -17119,18 +17120,18 @@ fi
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 

-echo "$as_me:17122: checking for updated LDFLAGS" >&5
+echo "$as_me:17123: checking for updated LDFLAGS" >&5

 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LDFLAGS" ; then
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LDFLAGS" ; then

-echo "$as_me:17125: result: maybe" >&5
+echo "$as_me:17126: result: maybe" >&5

 echo "${ECHO_T}maybe" >&6
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 
 echo "${ECHO_T}maybe" >&6
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me-configure}:17129: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:17130: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me-configure}:17133: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:17134: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 case "$EXTRA_LDFLAGS" in #(vi
 -Wl,-rpath,*) #(vi
 
 case "$EXTRA_LDFLAGS" in #(vi
 -Wl,-rpath,*) #(vi


@@ -17152,7 +17153,7 @@ if test -n "$cf_rpath_hack" ; then
        do
                test -n "$verbose" && echo "    Filtering $cf_rpath_src" 1>&6
 
        do
                test -n "$verbose" && echo "    Filtering $cf_rpath_src" 1>&6
 

-echo "${as_me-configure}:17155: testing Filtering $cf_rpath_src ..." 1>&5
+echo "${as_me-configure}:17156: testing Filtering $cf_rpath_src ..." 1>&5

 
                case $cf_rpath_src in #(vi
                -L*) #(vi
 
                case $cf_rpath_src in #(vi
                -L*) #(vi


@@ -17163,7 +17164,7 @@ echo "${as_me-configure}:17155: testing Filtering $cf_rpath_src ..." 1>&5
                        fi
                        test -n "$verbose" && echo "    ...Filter $cf_rpath_tmp" 1>&6
 
                        fi
                        test -n "$verbose" && echo "    ...Filter $cf_rpath_tmp" 1>&6
 

-echo "${as_me-configure}:17166: testing ...Filter $cf_rpath_tmp ..." 1>&5
+echo "${as_me-configure}:17167: testing ...Filter $cf_rpath_tmp ..." 1>&5

 
                        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        ;;
 
                        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        ;;


@@ -17173,15 +17174,15 @@ echo "${as_me-configure}:17166: testing ...Filter $cf_rpath_tmp ..." 1>&5
        LDFLAGS=$cf_rpath_dst
        test -n "$verbose" && echo "    ...checked LDFLAGS $LDFLAGS" 1>&6
 
        LDFLAGS=$cf_rpath_dst
        test -n "$verbose" && echo "    ...checked LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me-configure}:17176: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:17177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5

 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me-configure}:17180: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:17181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 fi
 else
 
 fi
 else

-echo "$as_me:17184: result: no" >&5
+echo "$as_me:17185: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -17301,7 +17302,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:17304: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17305: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL


@@ -17477,7 +17478,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:17480: error: ambiguous option: $1
+    { { echo "$as_me:17481: error: ambiguous option: $1

 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -17496,7 +17497,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
     ac_need_defaults=false;;
 
   # This is an error.

-  -*) { { echo "$as_me:17499: error: unrecognized option: $1
+  -*) { { echo "$as_me:17500: error: unrecognized option: $1

 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -17594,7 +17595,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;

-  *) { { echo "$as_me:17597: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:17598: error: invalid argument: $ac_config_target" >&5

 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac


@@ -17982,7 +17983,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:17985: creating $ac_file" >&5
+    { echo "$as_me:17986: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi


@@ -18000,7 +18001,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:18003: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18004: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -18013,7 +18014,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
            echo $srcdir/$f
          else
            # /dev/null tree

-           { { echo "$as_me:18016: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18017: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -18079,7 +18080,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   * )   ac_file_in=$ac_file.in ;;
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:18082: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18083: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the


@@ -18090,7 +18091,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:18093: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18094: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -18103,7 +18104,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
            echo $srcdir/$f
          else
            # /dev/null tree

-           { { echo "$as_me:18106: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18107: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -18161,7 +18162,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then

-      { echo "$as_me:18164: $ac_file is unchanged" >&5
+      { echo "$as_me:18165: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

diff --git a/configure.in b/configure.in
index d122b6e0664d339fc4dd22ba2b2fcb39364a34b4..fe313bd433e3e9a86c68d1d7da8f783d5f291826 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *

 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *


@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: configure.in,v 1.461 2009/01/04 01:16:23 tom Exp $
+dnl $Id: configure.in,v 1.463 2009/01/06 01:40:09 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)

-AC_REVISION($Revision: 1.461 $)
+AC_REVISION($Revision: 1.463 $)

 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -1758,6 +1758,7 @@ if test "$NCURSES_LIBUTF8" = 1 ; then
        AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
 fi
 fi
        AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
 fi
 fi

+WITH_OVERWRITE=$with_overwrite

 
 AC_SUBST(WITH_OVERWRITE)
 AC_SUBST(TICS_LIST)
 
 AC_SUBST(WITH_OVERWRITE)
 AC_SUBST(TICS_LIST)

diff --git a/dist.mk b/dist.mk
index f0a8d90e5abf1dc0ba8bf579f4f4c4e2791e1768..65a5adf1ff5a76c7e70bd20e78669412e198c144 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.680 2009/01/04 21:51:56 tom Exp $
+# $Id: dist.mk,v 1.681 2009/01/05 23:52:40 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7

-NCURSES_PATCH = 20090104
+NCURSES_PATCH = 20090105

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index b339fc006fcd832a7aa609598d931ae91bb5d1db..bb1dd9aecb0b3b4e7e0c4bfef1103e141606880f 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: ncurses-config.in,v 1.15 2009/01/03 21:10:18 tom Exp $
+# $Id: ncurses-config.in,v 1.21 2009/01/06 01:06:21 tom Exp $

 ##############################################################################
 # Copyright (c) 2006-2007,2009 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 2006-2007,2009 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -28,7 +28,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
 # authorization.                                                             #
 ##############################################################################
 #

-# Author: Thomas E. Dickey, 2006
+# Author: Thomas E. Dickey, 2006-on

 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"


@@ -39,37 +39,32 @@ libdir="@libdir@"
 datadir="@datadir@"
 mandir="@mandir@"
 
 datadir="@datadir@"
 mandir="@mandir@"
 

-THIS="${LIB_NAME}@DFT_ARG_SUFFIX@"
+THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"

 
 LANG=C;                export LANG
 LANGUAGE=C;    export LANGUAGE
 LC_ALL=C;      export LC_ALL
 LC_CTYPE=C;    export LC_CTYPE
 
 
 LANG=C;                export LANG
 LANGUAGE=C;    export LANGUAGE
 LC_ALL=C;      export LC_ALL
 LC_CTYPE=C;    export LC_CTYPE
 

-test $# = 0 && exec @SHELL@ $0 --error
-
-while test $# -gt 0; do
-       case "$1" in
-       -*=*)
-               ARG=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
-               ;;
-       *)
-               ARG=
+# with --disable-overwrite, we installed into a subdirectory, but transformed
+# the headers to include like this:
+#      <ncurses@LIB_SUFFIX@/curses.h>
+if test x@WITH_OVERWRITE@ = xno ; then
+       case $includedir in
+       $prefix/include/ncurses@LIB_SUFFIX@)
+               includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`

                ;;
        esac
                ;;
        esac

+fi

 
 

+test $# = 0 && exec @SHELL@ $0 --error
+
+while test $# -gt 0; do

        case "$1" in
        # basic configuration
        case "$1" in
        # basic configuration

-       --prefix=*)
-               prefix="$ARG"
-               test -z "$exec_prefix" && exec_prefix="$ARG"
-               ;;

        --prefix)
                echo "$prefix"
                ;;
        --prefix)
                echo "$prefix"
                ;;

-       --exec-prefix=*)
-               exec_prefix="$ARG"
-               ;;

        --exec-prefix)
                echo "$exec_prefix"
                ;;
        --exec-prefix)
                echo "$exec_prefix"
                ;;


@@ -79,7 +74,7 @@ while test $# -gt 0; do
                if test "${includedir}" != /usr/include ; then
                        INCS="-I${includedir}"
                fi
                if test "${includedir}" != /usr/include ; then
                        INCS="-I${includedir}"
                fi

-               if test "@WITH_OVERWRITE@" != no ; then
+               if test "x@WITH_OVERWRITE@" == xno ; then

                        INCS="$INCS -I${includedir}/${THIS}"
                fi
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
                        INCS="$INCS -I${includedir}/${THIS}"
                fi
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO


@@ -133,9 +128,7 @@ Usage: ${THIS}-config [options]
 
 Options:
   --prefix           echos the package-prefix of ${THIS}
 
 Options:
   --prefix           echos the package-prefix of ${THIS}

-  --prefix=ARG       sets the package-prefix of ${THIS}

   --exec-prefix      echos the executable-prefix of ${THIS}
   --exec-prefix      echos the executable-prefix of ${THIS}

-  --exec-prefix=ARG  sets the executable-prefix of ${THIS}

 
   --cflags           echos the C compiler flags needed to compile with ${THIS}
   --libs             echos the libraries needed to link with ${THIS}
 
   --cflags           echos the C compiler flags needed to compile with ${THIS}
   --libs             echos the libraries needed to link with ${THIS}