[Liboss-commit] CVS: liboss configure.in,1.19,1.20

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv20441

Modified Files:
	configure.in 
Log Message:
LIBESD resembles LIBDL


Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.in	22 Oct 2002 05:21:26 -0000	1.19
+++ configure.in	22 Oct 2002 16:51:45 -0000	1.20
@@ -187,8 +187,7 @@
        esd_prefix="$withval"
     )
 
-AC_SUBST(esd_prefix)
-
+ESD_INCS=
 AC_CHECK_HEADERS(esd.h,[esd=true],
 [
   esd=false;
@@ -196,7 +195,7 @@
   for esd_include_dir in ${esd_prefix}/include /usr/include /usr/local/include; do
     if test -f "${esd_include_dir}/esd.h"; then
       esd=true
-      INCLUDES="-I${esd_include_dir} $USER_INCLUDES $INCLUDES"
+      ESD_INCS="-I${esd_include_dir}"
       AC_MSG_RESULT(${esd_include_dir})
       break
     fi
@@ -205,16 +204,20 @@
     AC_MSG_RESULT(no)
   fi
 ])
+AC_SUBST(ESD_INCS)
 
+LIBESD=
 if test x$esd = xtrue; then
-  if test -n "${esd_prefix}"; then
-    LIBS="-L${esd_prefix}/lib $LIBS"
-  fi
   AC_CHECK_LIB(esd,esd_open_sound,[
     esd=true;
-    LIBS="$LIBS $USER_LIBS -lesd";
+    if test -n "${esd_prefix}"; then
+      LIBESD="-L${esd_prefix}/lib -lesd";
+    else
+      LIBESD="-lesd";
+    fi
   ])
 fi
+AC_SUBST(LIBESD)
 
 AM_CONDITIONAL(ESD, test "x$esd" = "xtrue" )