ncurses 5.9 - patch 20111008

[ncurses.git] / misc / gen-pkgconfig.in

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index efd29105b571c33ccf5cfe119e61bb254ad6fa6e..c924bc633fac2d8fb0bd30ca87ae903820c96274 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: gen-pkgconfig.in,v 1.8 2010/02/06 22:12:07 Miroslav.Lichvar Exp $
+# $Id: gen-pkgconfig.in,v 1.10 2011/10/08 19:20:15 tom Exp $

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

-# Copyright (c) 2009,2010 Free Software Foundation, Inc.                     #
+# Copyright (c) 2009-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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


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

-# Author: Thomas E. Dickey, 2009
+# Author: Thomas E. Dickey

 #
 # The complete configure script for ncurses is the ncurses5-config (or similar
 # name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc).
 #
 # The complete configure script for ncurses is the ncurses5-config (or similar
 # name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc).


@@ -68,6 +68,18 @@ if test $TINFO_NAME = $LIB_NAME ; then
        SUB_LIBRARY_REQ=
 fi
 
        SUB_LIBRARY_REQ=
 fi
 

+if test "$includedir" = "/usr/include" ; then
+       CFLAGS=
+else
+       CFLAGS="-I\${includedir}"
+fi
+
+if test "$libdir" = "/usr/lib" ; then
+       LDFLAGS=
+else
+       LDFLAGS="-L\${libdir}"
+fi
+

 for lib in ../lib/*
 do
        name=`basename $lib`
 for lib in ../lib/*
 do
        name=`basename $lib`


@@ -86,40 +98,31 @@ do
        name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
        name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"

+       reqs=
+

        if test $name = $MAIN_LIBRARY ; then
        if test $name = $MAIN_LIBRARY ; then

-               reqs=$SUB_LIBRARY_REQ

                desc="$desc library"
        elif test $name = $SUB_LIBRARY ; then
                desc="$desc library"
        elif test $name = $SUB_LIBRARY ; then

-               reqs=

                desc="$desc terminal interface library"
        elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
                desc="$desc terminal interface library"
        elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then

-               reqs="$PANEL_LIBRARY $MENU_LIBRARY $FORM_LIBRARY $MAIN_LIBRARY $SUB_LIBRARY_REQ"
+               reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY"

                desc="$desc add-on library"
        else
                desc="$desc add-on library"
        else

-               reqs="$MAIN_LIBRARY $SUB_LIBRARY_REQ"
+               reqs="$MAIN_LIBRARY"

                desc="$desc add-on library"
        fi
 
                desc="$desc add-on library"
        fi
 

-       if test "$includedir" = "/usr/include" ; then
-               cflags=
-       else
-               cflags="-I\${includedir}"
-       fi
-
-       if test "$libdir" = "/usr/lib" ; then
-               libs=
-       else
-               libs="-L\${libdir}"
-       fi
-       libs="$libs -l$name"
-
-       # add dependencies that pkg-config cannot guess about
-       if test -z "$reqs" ; then
-               libs="$libs @LIBS@"
+       if test $name != $SUB_LIBRARY ; then
+               if test $name != $TINFO_NAME ; then
+                       test -n "$reqs" && reqs="$reqs, "
+                       reqs="${reqs}${SUB_LIBRARY}"
+               fi

        fi
 
        echo "** creating ${name}.pc"
        cat >${name}.pc <<EOF
        fi
 
        echo "** creating ${name}.pc"
        cat >${name}.pc <<EOF

+# vile:makemode
+

 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir
 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir


@@ -130,10 +133,13 @@ version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 Name: $name
 Description: $desc
 Version: \${version}
 Name: $name
 Description: $desc
 Version: \${version}

-Requires: $reqs
-Libs: $libs
-Cflags: $cflags
+URL: http://invisible-island.net/ncurses
+Requires.private: $reqs
+Libs: $LDFLAGS -l$name
+Libs.private: @LIBS@
+Cflags: $CFLAGS

 EOF
 EOF

-       # pr -f ${name}.pc
+
+       #pr -f ${name}.pc

 done
 # vile:shmode
 done
 # vile:shmode