+++ /dev/null
---- esound-0.2.26/configure.in.orig Mon May 6 10:27:26 2002
-+++ esound-0.2.26/configure.in Thu May 9 08:43:27 2002
-@@ -44,12 +44,12 @@
-
- AC_FUNC_ALLOCA
- AC_CHECK_FUNCS(setenv putenv fchown fchmod gethostbyname2)
--AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
--AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
--AC_CHECK_FUNC(nanosleep,,[
-- AC_CHECK_LIB(rt,nanosleep,,[AC_CHECK_LIB(posix4,nanosleep)])])
-+AC_CHECK_FUNC(connect,[],[AC_CHECK_LIB(socket,connect)])
-+AC_CHECK_FUNC(gethostbyname,[],[AC_CHECK_LIB(nsl,gethostbyname)])
-+AC_CHECK_FUNC(nanosleep,[],[
-+ AC_CHECK_LIB(rt,nanosleep,[],[AC_CHECK_LIB(posix4,nanosleep)])])
- AC_CHECK_FUNCS(usleep)
--AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
-+AC_CHECK_FUNC(inet_aton,[],[AC_CHECK_LIB(resolv,inet_aton)])
-
- case $ac_cv_func_nanosleep/$ac_cv_lib_rt_nanosleep/$ac_cv_lib_posix4_nanosleep in
- no/no/no) ;;
-@@ -66,7 +66,7 @@
- AC_TRY_COMPILE([
- #include<sys/types.h>
- #include<netinet/in.h>],
-- [unsigned long ul = INADDR_LOOPBACK;],,
-+ [unsigned long ul = INADDR_LOOPBACK;],[],
- [AC_DEFINE(INADDR_LOOPBACK, (u_int32_t)0x7f000001)])
-
-
-@@ -202,12 +202,12 @@
- echo "---------------------------------------------------------------------"
- echo "--- Checking to see which audio libraries are required for linking.";
- echo "--- Most of these checks should also fail. Do not be alarmed.";
-- AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
-- AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)])
-+ AC_CHECK_FUNC(_oss_ioctl,[],[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
-+ AC_CHECK_FUNC(ALnewconfig,[],[AC_CHECK_LIB(audio,ALnewconfig)])
- if test "x$enable_alsa" = "xyes"; then
-- AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)])
-- AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(asound,snd_cards)])
-- AC_CHECK_FUNC(snd_pcm_pause,,[AC_CHECK_LIB(asound,snd_pcm_pause)])
-+ AC_CHECK_FUNC(snd_cards,[],[AC_CHECK_LIB(sound,snd_cards)])
-+ AC_CHECK_FUNC(snd_cards,[],[AC_CHECK_LIB(asound,snd_cards)])
-+ AC_CHECK_FUNC(snd_pcm_pause,[],[AC_CHECK_LIB(asound,snd_pcm_pause)])
- fi
- else
- AC_DEFINE(DRIVER_NONE)
+++ /dev/null
-diff -Nru esound-0.2.29/esd_config.c esound-0.2.29.new/esd_config.c
---- esound-0.2.29/esd_config.c Wed Jun 19 12:14:24 2002
-+++ esound-0.2.29.new/esd_config.c Mon Mar 10 13:18:20 2003
-@@ -41,12 +41,18 @@
- fclose(fh);
- }
- free(fn);
--
-- tmpenv = getenv("HOME");
-+ tmpenv = getenv("CONFIG_DIR");
- if(tmpenv) {
-- fn = malloc(strlen(tmpenv) + sizeof("/.esd.conf"));
-- sprintf(fn, "%s/.esd.conf", tmpenv);
--
-+ fn = malloc(strlen(tmpenv) + sizeof("/esd.conf"));
-+ sprintf(fn, "%s/esd.conf", tmpenv);
-+ } else {
-+ tmpenv = getenv("HOME");
-+ if(tmpenv) {
-+ fn = malloc(strlen(tmpenv) + sizeof("/.esd.conf"));
-+ sprintf(fn, "%s/.esd.conf", tmpenv);
-+ }
-+ }
-+ if(tmpenv) {
- fh = fopen(fn, "r");
-
- if(fh)
-diff -Nru esound-0.2.29/esddsp.c esound-0.2.29.new/esddsp.c
---- esound-0.2.29/esddsp.c Mon Aug 26 16:39:55 2002
-+++ esound-0.2.29.new/esddsp.c Mon Mar 10 12:58:56 2003
-@@ -122,6 +122,13 @@
- {
- use_mixer = 1;
-
-+ str = getenv ("CONFIG_DIR");
-+ if (str)
-+ {
-+ mixer = malloc (strlen (str) + strlen (ident) + 9);
-+ sprintf (mixer, "%s/esddsp_%s", str, ident);
-+ }
-+ else {
- str = getenv ("HOME");
- if (str)
- {
-@@ -133,7 +140,7 @@
- fprintf (stderr, "esddsp: can't get home directory\n");
- exit (1);
- }
--
-+ }
- DPRINTF ("mixer settings file: %s\n", mixer);
- }
- }
-diff -Nru esound-0.2.29/esdlib.c esound-0.2.29.new/esdlib.c
---- esound-0.2.29/esdlib.c Mon Jul 15 09:28:26 2002
-+++ esound-0.2.29.new/esdlib.c Mon Mar 10 13:02:41 2003
-@@ -159,6 +159,7 @@
- char *auth_filename = 0;
- unsigned char auth_key[ESD_KEY_LEN];
- char *home = NULL;
-+ char *config_dir = NULL;
- int namelen, retval;
- void (*phandler)(int);
-
-@@ -168,6 +169,18 @@
- phandler = signal( SIGPIPE, dummy_signal ); /* for closed esd conns */
-
- /* assemble the authorization filename */
-+ config_dir = getenv("CONFIG_DIR");
-+ if (config_dir) {
-+ namelen = strlen(config_dir) + sizeof("/esd_auth");
-+ if ((auth_filename = malloc(namelen + 1)) == 0) {
-+ fprintf( stderr, "Memory exhausted\n" );
-+ signal( SIGPIPE, phandler );
-+ return -1;
-+ }
-+
-+ strcpy( auth_filename, config_dir );
-+ strcat( auth_filename, "/esd_auth" );
-+ } else {
- home = getenv( "HOME" );
- if ( !home ) {
- fprintf( stderr, "HOME environment variable not set?\n" );
-@@ -184,7 +197,7 @@
-
- strcpy( auth_filename, home );
- strcat( auth_filename, "/.esd_auth" );
--
-+ }
- retval = 0;
- /* open the authorization file */
- if ( -1 == (auth_fd = open( auth_filename, O_RDONLY ) ) ) {