X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fgen-pkgconfig.in;h=35ae12602e8cc6ca9b7bdf419229345e8d040cae;hp=12bf11ce55f07715f0cbc3fc49e869b2c09d3133;hb=3a0d9d27e0cf115ff9dcc6163c251bccaa62bd7d;hpb=96097feb6ca4e2c4c944f3ed789c89d964611655

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 12bf11ce..35ae1260 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.3 2009/01/03 22:26:47 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.7 2009/03/14 20:37:54 tom Exp $
 ##############################################################################
 # Copyright (c) 2009 Free Software Foundation, Inc.                          #
 #                                                                            #
@@ -39,9 +39,12 @@
 # library, except that the tinfo library does not depend on ncurses.
 LIB_NAME=@LIB_NAME@
 TINFO_NAME=@TINFO_NAME@
+PANEL_NAME=panel # @PANEL_NAME@
+MENU_NAME=menu # @MENU_NAME@
+FORM_NAME=form # @FORM_NAME@
+CXX_NAME=ncurses++ # @CXX_NAME@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-LD_RPATH_OPT=@LD_RPATH_OPT@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
@@ -55,14 +58,28 @@ show_libdir='@libdir@'
 
 MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
 SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
+PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
+MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
+FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
+
+SUB_LIBRARY_REQ=${SUB_LIBRARY}
+TINFO_NAME_REQ=${TINFO_NAME}
+if test $TINFO_NAME = $LIB_NAME ; then
+	SUB_LIBRARY_REQ=
+	TINFO_NAME_REQ=
+fi
 
 for lib in ../lib/*
 do
 	name=`basename $lib`
+	if test "$name" = "*" ; then
+		break
+	fi
+
 	root=`basename $name "$DFT_DEP_SUFFIX"`
-	if test "$name" == "$root" ; then
+	if test "$name" = "$root" ; then
 		root=`basename $name "$CXX_LIB_SUFFIX"`
-		if test "$name" == "$root" ; then
+		if test "$name" = "$root" ; then
 			continue
 		fi
 	fi
@@ -71,13 +88,16 @@ do
 
 	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
 	if test $name = $MAIN_LIBRARY ; then
-		reqs=
+		reqs=$TINFO_NAME_REQ
 		desc="$desc library"
 	elif test $name = $SUB_LIBRARY ; then
 		reqs=
 		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"
+		desc="$desc add-on library"
 	else
-		reqs=$MAIN_LIBRARY
+		reqs="$MAIN_LIBRARY $SUB_LIBRARY_REQ"
 		desc="$desc add-on library"
 	fi
 
@@ -96,9 +116,7 @@ do
 
 	# add dependencies that pkg-config cannot guess about
 	if test -z "$reqs" ; then
-		if test -z "$LD_RPATH_OPT" ; then
-			libs="$libs @LIBS@"
-		fi
+		libs="$libs @LIBS@"
 	fi
 
 	echo "** creating ${name}.pc"