Subject: pkg/7594: mixer applet cannot be built in gnome-core pkg
To: None <gnats-bugs@gnats.netbsd.org>
From: None <luke@eed.miee.ru>
List: netbsd-bugs
Date: 05/17/1999 13:05:57
>Number:         7594
>Category:       pkg
>Synopsis:       mixer applet cannot be built in gnome-core pkg
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager (NetBSD software packages system bug manager)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 17 13:05:01 1999
>Last-Modified:
>Originator:     Oleg Polyanski
>Organization:
dazzle horizon

>Release:        NetBSD-current-18.May.99 and earlier
>Environment:
	all netbsd ports supported by gnome-core

>Description:
	`configure' knows nothing about `/usr/include/soundcard.h' and
disables mixer applet.

>How-To-Repeat:
	do `make' in `x11/gnome-core'

>Fix:

diff -urN gnome-core-1.0.5.orig/applets/mixer/mixer.c gnome-core-1.0.5/applets/mixer/mixer.c
--- gnome-core-1.0.5.orig/applets/mixer/mixer.c	Fri Apr  9 00:10:51 1999
+++ gnome-core-1.0.5/applets/mixer/mixer.c	Mon May 17 22:51:37 1999
@@ -35,6 +35,8 @@
 #include <machine/soundcard.h>
 #elif HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+#include <soundcard.h>
 #else
 #error No soundcard defenition!
 #endif /* SOUNDCARD_H */
diff -urN gnome-core-1.0.5.orig/config.h.in gnome-core-1.0.5/config.h.in
--- gnome-core-1.0.5.orig/config.h.in	Fri Apr  9 03:26:26 1999
+++ gnome-core-1.0.5/config.h.in	Mon May 17 22:51:27 1999
@@ -174,6 +174,9 @@
 /* Define if you have the <sys/soundcard.h> header file.  */
 #undef HAVE_SYS_SOUNDCARD_H
 
+/* Define if you have the <soundcard.h> header file.  */
+#undef HAVE_SOUNDCARD_H
+
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
diff -urN gnome-core-1.0.5.orig/configure.in gnome-core-1.0.5/configure.in
--- gnome-core-1.0.5.orig/configure.in	Fri Apr  9 03:25:58 1999
+++ gnome-core-1.0.5/configure.in	Mon May 17 22:51:22 1999
@@ -126,7 +126,8 @@
 P_MIXER=
 AC_CHECK_HEADERS(linux/soundcard.h,[P_MIXER=mixer],[
   AC_CHECK_HEADERS(machine/soundcard.h, [P_MIXER=mixer],[
-    AC_CHECK_HEADERS(sys/soundcard.h, [P_MIXER=mixer]) ]) ])
+    AC_CHECK_HEADERS(sys/soundcard.h, [P_MIXER=mixer], [ 
+      AC_CHECK_HEADERS(soundcard.h, [P_MIXER=mixer]) ]) ]) ])
 AM_CONDITIONAL(APPLET_MIXER, test "$P_MIXER" = "mixer")
 if test "$P_MIXER" != "mixer"; then
   AC_MSG_WARN([*** \`mixer' applet will not be built ***])
>Audit-Trail:
>Unformatted: