ncurses 5.7 - patch 20100206

[ncurses.git] / misc / ncurses-config.in

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

-# $Id: ncurses-config.in,v 1.21 2009/01/06 01:06:21 tom Exp $
+# $Id: ncurses-config.in,v 1.24 2010/02/06 22:12:16 Miroslav.Lichvar Exp $

 ##############################################################################
 ##############################################################################

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

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -40,6 +40,7 @@ datadir="@datadir@"
 mandir="@mandir@"
 
 THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
 mandir="@mandir@"
 
 THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"

+TINFO_LIB="@TINFO_ARG_SUFFIX@"

 
 LANG=C;                export LANG
 LANGUAGE=C;    export LANGUAGE
 
 LANG=C;                export LANG
 LANGUAGE=C;    export LANGUAGE


@@ -74,7 +75,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 "x@WITH_OVERWRITE@" == xno ; 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


@@ -82,9 +83,15 @@ while test $# -gt 0; do
 ENDECHO
                ;;
        --libs)
 ENDECHO
                ;;
        --libs)

+               if test @TINFO_NAME@ = @LIB_NAME@ ; then

                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
                        -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
 ENDECHO
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
                        -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
 ENDECHO

+               else
+               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+                       -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
+ENDECHO
+               fi

                ;;
        # identification
        --version)
                ;;
        # identification
        --version)