ncurses 5.9 - patch 20111210

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

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 8baf47881c3716bf961613c5bb5e39cdcfa45b1f..bd7529e6e9ec0f1c9b9748d9fb2dbc699d556526 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.23 2009/03/14 19:20:57 Charles.Wilson Exp $
+# $Id: ncurses-config.in,v 1.27 2011/08/13 22:11:20 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-2010,2011 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"), #
@@ -40,7 +40,8 @@ datadir="@datadir@"
 mandir="@mandir@"
 
 THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
-TINFO_LIB="@TINFO_NAME@@DFT_ARG_SUFFIX@"
+TINFO_LIB="@TINFO_ARG_SUFFIX@"
+RPATH_LIST="@RPATH_LIST@"
 
 LANG=C;                export LANG
 LANGUAGE=C;    export LANGUAGE
@@ -72,24 +73,30 @@ while test $# -gt 0; do
        # compile/link
        --cflags)
                INCS=
-               if test "${includedir}" != /usr/include ; then
-                       INCS="-I${includedir}"
-               fi
                if test "x@WITH_OVERWRITE@" = xno ; then
                        INCS="$INCS -I${includedir}/${THIS}"
                fi
+               if test "${includedir}" != /usr/include ; then
+                       INCS="$INCS -I${includedir}"
+               fi
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
                        $INCS
 ENDECHO
                ;;
        --libs)
+               if test "$libdir" = /usr/lib
+               then
+                       LIBDIR=
+               else
+                       LIBDIR=-L$libdir
+               fi
                if test @TINFO_NAME@ = @LIB_NAME@ ; then
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-                       -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+                       $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@
+                       $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
 ENDECHO
                fi
                ;;
@@ -163,4 +170,5 @@ ENDHELP
        esac
        shift
 done
+# vi:ts=4 sw=4
 # vile:shmode