X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fgen-pkgconfig.in;h=62d09ff61905b8ccfee6443dcd37efdb354065f0;hp=ab38238a6510abb112beaf2650b50a68a57ef308;hb=93ed44d781ca36f55021e0ad55f1ce33de62f7ba;hpb=ad0373780c377b7abe50c77fc9a36092972dc872

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index ab38238a..62d09ff6 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.21 2015/02/21 21:36:31 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.29 2015/07/04 20:37:01 tom Exp $
 ##############################################################################
 # Copyright (c) 2009-2014,2015 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -58,38 +58,63 @@ show_exec_prefix='@exec_prefix@'
 show_includedir='@includedir@@includesubdir@'
 show_libdir='@libdir@'
 
-MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
+MAIN_LIBRARY="${LIB_NAME}@USE_ARG_SUFFIX@"
 SUB_LIBRARY="${TINFO_ARG_SUFFIX}"
-PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
-MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
-FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
+PANEL_LIBRARY="${PANEL_NAME}@USE_ARG_SUFFIX@"
+MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
+FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
 
 CFLAGS="@PKG_CFLAGS@"
 if test "$includedir" != "/usr/include" ; then
-	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include/,'`
+	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
 	test "$includetop" = "/usr/include" && includetop="$includedir"
-	if test "x$includetop" != "$includedir"
+	if test "x$includetop" != "x$includedir"
 	then
 		CFLAGS="$CFLAGS -I${includetop}"
 	fi
 	CFLAGS="$CFLAGS -I\${includedir}"
 fi
 
-if test "$libdir" = "/usr/lib" ; then
-	LDFLAGS=
-else
-	LDFLAGS="-L\${libdir}"
+LDFLAGS=
+if test "$libdir" != "/usr/lib" ; then
+	LDFLAGS="$LDFLAGS -L\${libdir}"
+fi
+if test "x@EXTRA_LDFLAGS@" != "x" ; then
+	LDFLAGS="$LDFLAGS @EXTRA_LDFLAGS@"
+fi
+
+# Check if we should specify the tinfo library explicitly so that terminfo
+# functions or curses variables (which also reside in tinfo) can be linked
+# using the -lncurses option.
+NEED_TINFO=no
+if test "x@TINFO_LIBS@" != "x" && \
+   test "x$TINFO_ARG_SUFFIX" != "x$MAIN_LIBRARY"
+then
+	case "x$LDFLAGS" in
+	(*--as-needed*)
+		NEED_TINFO=yes
+		;;
+	esac
+	case "x$LDFLAGS" in
+	(*,-rpath,*)
+		;;
+	(*)
+		NEED_TINFO=yes
+		;;
+	esac
 fi
 
 for name in @PC_MODULES_TO_MAKE@
 do
 	name="${name}"
+	LIBS="-l$name"
 
 	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
 	reqs=
 
 	if test $name = $MAIN_LIBRARY ; then
 		desc="$desc library"
+		test $NEED_TINFO = yes && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
 	elif test $name = $SUB_LIBRARY ; then
 		desc="$desc terminal interface library"
 	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
@@ -100,19 +125,24 @@ do
 		desc="$desc add-on library"
 	fi
 
-	if test $name != $SUB_LIBRARY && test $SUB_LIBRARY != $MAIN_LIBRARY ; then
-		if test $name != $TINFO_NAME ; then
-			test -n "$reqs" && reqs="$reqs, "
-			reqs="${reqs}${SUB_LIBRARY}${suffix}"
-		fi
+	if test $name != $SUB_LIBRARY && \
+	   test $SUB_LIBRARY != $MAIN_LIBRARY && \
+	   test $name != $TINFO_NAME && \
+	   test $NEED_TINFO != yes ; then
+		test -n "$reqs" && reqs="$reqs, "
+		reqs="${reqs}${SUB_LIBRARY}${suffix}"
 	fi
 
-	echo "** creating ${name}.pc"
+	echo "** creating ${name}${suffix}.pc"
 	cat >${name}${suffix}.pc <<EOF
+# pkg-config file generated by `basename $0`
+# vile:makemode
+
 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir
 includedir=$show_includedir
+abi_version=@cf_cv_abi_version@
 major_version=@NCURSES_MAJOR@
 version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 
@@ -121,11 +151,10 @@ Description: $desc
 Version: \${version}
 URL: http://invisible-island.net/ncurses
 Requires.private: $reqs
-Libs: $LDFLAGS -l$name
+Libs: $LDFLAGS $LIBS
 Libs.private: @LIBS@
 Cflags: $CFLAGS
 EOF
 
-	#pr -f ${name}.pc
 done
 # vile:shmode