Patch to fix build of xbiff/xedit/xlogo/xman/xmore/xvidtune

[Stefan Dirsch]

Hi

The following patch fixes the build of xbiff, xedit, xlogo, xman,
xmore and xvidtune. Hopefully it can be applied to CVS after
discusssing it.

Best regards,
Stefan

Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.)   SUSE LINUX Products GmbH
Tel: 0911-740 53 0            Maxfeldstraße 5
FAX: 0911-740 53 479          D-90409 Nürnberg
http://www.suse.de            Germany 
------------------------------------------------------
-------------- next part --------------
--- app/xbiff/configure.ac.orig	2005-07-21 09:03:54.000000000 +0200
+++ app/xbiff/configure.ac	2005-07-21 09:11:17.000000000 +0200
@@ -31,11 +31,11 @@
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XAW_CHECK_XPRINT_SUPPORT(XBIFF)
+XAW_CHECK_XPRINT_SUPPORT(XAW)
 PKG_CHECK_MODULES(XBITMAPS, xbitmaps)
 
-XBIFF_CFLAGS="$DEP_CFLAGS $XBITMAPS_CFLAGS"
-XBIFF_LIBS="$DEP_LIBS $XBITMAPS_LIBS"
+XBIFF_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS $XBITMAPS_CFLAGS"
+XBIFF_LIBS="$DEP_LIBS $XAW_LIBS $XBITMAPS_LIBS"
 
 AC_SUBST(XBIFF_CFLAGS)
 AC_SUBST(XBIFF_LIBS)
--- app/xedit/configure.ac.orig	2005-07-21 09:29:56.000000000 +0200
+++ app/xedit/configure.ac	2005-07-21 09:32:24.000000000 +0200
@@ -33,12 +33,12 @@
 AC_PROG_RANLIB
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XEDIT)
+XAW_CHECK_XPRINT_SUPPORT(XAW)
 if test "x$xaw_use_xprint" = "xyes" ; then
    PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil)
 
-   XEDIT_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
-   XEDIT_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
+   XEDIT_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS $XPRINT_UTIL_CFLAGS"
+   XEDIT_LIBS="$DEP_LIBS $XAW_LIBS $XPRINT_UTIL_LIBS"
 fi
 
 AC_SUBST(XEDIT_CFLAGS)
--- app/xlogo/configure.ac.orig	2005-07-21 09:37:55.000000000 +0200
+++ app/xlogo/configure.ac	2005-07-21 09:45:14.000000000 +0200
@@ -31,19 +31,19 @@
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XLOGO)
+XAW_CHECK_XPRINT_SUPPORT(XAW)
 
 if test "x$xaw_use_xprint" = "xyes" ; then
    PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil)
 
-   XLOGO_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
-   XLOGO_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
+   DEP_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
+   DEP_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
 fi
 
 PKG_CHECK_MODULES(XRENDER, xrender)
 
-XLOGO_CFLAGS="$DEP_CFLAGS $XRENDER_CFLAGS"
-XLOGO_LIBS="$DEP_LIBS $XRENDER_LIBS"
+XLOGO_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS $XRENDER_CFLAGS"
+XLOGO_LIBS="$DEP_LIBS $XAW_LIBS $XRENDER_LIBS"
 
 AC_SUBST(XLOGO_CFLAGS)
 AC_SUBST(XLOGO_LIBS)
--- app/xman/configure.ac.orig	2005-07-21 09:47:45.000000000 +0200
+++ app/xman/configure.ac	2005-07-21 09:51:41.000000000 +0200
@@ -35,15 +35,18 @@
    AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XMAN)
+XAW_CHECK_XPRINT_SUPPORT(XAW)
 
 if test "x$xaw_use_xprint" = "xyes" ; then
    PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil)
 
-   XMAN_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
-   XMAN_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
+   DEP_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
+   DEP_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
 fi
 
+XMAN_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
+XMAN_LIBS="$DEP_LIBS $XAW_LIBS"
+
 AC_SUBST(XMAN_CFLAGS)
 AC_SUBST(XMAN_LIBS)
 
--- app/xmore/configure.ac.orig	2005-07-21 09:59:04.000000000 +0200
+++ app/xmore/configure.ac	2005-07-21 09:56:11.000000000 +0200
@@ -32,14 +32,17 @@
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XMORE)
+XAW_CHECK_XPRINT_SUPPORT(XAW)
 if test "x$xaw_use_xprint" = "xyes" ; then
    PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil)
 
-   XMORE_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
-   XMORE_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
+   DEP_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
+   DEP_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
 fi
 
+XMORE_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
+XMORE_LIBS="$DEP_LIBS $XAW_LIBS"
+
 AC_SUBST(XMORE_CFLAGS)
 AC_SUBST(XMORE_LIBS)
 
--- app/xvidtune/configure.ac.orig	2005-07-21 09:59:28.000000000 +0200
+++ app/xvidtune/configure.ac	2005-07-21 10:01:59.000000000 +0200
@@ -38,8 +38,8 @@
 XAW_CHECK_XPRINT_SUPPORT(XAW)
 PKG_CHECK_MODULES(XVIDTUNE, xxf86vm)
 
-XVIDTUNE_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
-XVIDTUNE_LIBS="$DEP_LIBS $XAW_LIBS"
+XVIDTUNE_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS $XVIDTUNE_CFLAGS"
+XVIDTUNE_LIBS="$DEP_LIBS $XAW_LIBS $XVIDTUNE_LIBS"
 
 echo $XVIDTUNE_LIBS