-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}
-if test $TINFO_NAME = $LIB_NAME ; then
- SUB_LIBRARY_REQ=
+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,'`
+ test "$includetop" = "/usr/include" && includetop="$includedir"
+ if test "x$includetop" != "x$includedir"
+ then
+ CFLAGS="$CFLAGS -I${includetop}"
+ fi
+ CFLAGS="$CFLAGS -I\${includedir}"