[Liboss-commit] CVS: liboss TODO,1.4,1.5 configure.in,1.21,1.22

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

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

Modified Files:
	TODO configure.in 
Log Message:
more cruft removal and cleanup


Index: TODO
===================================================================
RCS file: /cvsroot/liboss/liboss/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TODO	9 May 2002 08:15:10 -0000	1.4
+++ TODO	22 Oct 2002 19:46:13 -0000	1.5
@@ -18,3 +18,6 @@
 
 - Add a oss_real_time(int delay_usec) function, since so many
   audio-related packages will need it.
+
+- Are there any flags and such that are needed for eventual support
+  of other platforms (pure darwin, darwin x86, etc.)?

Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in	22 Oct 2002 17:19:45 -0000	1.21
+++ configure.in	22 Oct 2002 19:46:14 -0000	1.22
@@ -70,24 +70,6 @@
 dnl
 AM_INIT_AUTOMAKE("liboss", $LIBOSS_MAJOR.$LIBOSS_MINOR.$LIBOSS_SUB$LIBOSS_PRE)
 
-dnl ====================================================================
-dnl Stolen from KDE's autoconfig
-dnl This macro takes three Arguments like this:
-dnl AC_FIND_FILE(qmovie.h, $qt_incdirs, qt_incdir)
-dnl the filename to look for, the list of paths to check and
-dnl the variable with the result.
-
-dnl
-dnl Made possible to build for another arch.
-dnl
-if test x$LIBOSS_BUILD != "x"; then
-  AC_MSG_RESULT([*** build forced to $LIBOSS_BUILD ***])
-  build=$LIBOSS_BUILD
-  host=$LIBOSS_BUILD
-else
-  check_athlon=yes
-fi
-
 dnl AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -117,11 +99,11 @@
 AC_SUBST(INCLUDES)
 
 dnl Common cflags for all platforms
-CFLAGS="$CFLAGS $nocpp $wall -I$prefix/include"
+CFLAGS="$CFLAGS $nocpp $wall -I${prefix}/include"
 NONPIC_CFLAGS="$CFLAGS $nopic"
 CPPFLAGS="$CPPFLAGS $CFLAGS"
 DEBUG_CFLAGS="$CFLAGS $DEBUG_CFLAGS"
-LDFLAGS="$LDFLAGS -L$prefix/lib"
+LDFLAGS="$LDFLAGS -L${prefix}/lib"
 AC_SUBST(NONPIC_CFLAGS)
 
 dnl
@@ -148,13 +130,6 @@
 AC_TYPE_SIZE_T
 AC_TYPE_MODE_T
 
-dnl
-dnl Using or not using -fPIC (override default behavior - system dependent)
-dnl
-AC_ARG_ENABLE(fpic,
-   [  --disable-fpic          disable -fPIC on shared libs (default on x86)],
-   no_fpic=yes, no_fpic=no)
-
 AC_CHECK_HEADERS(errno.h string.h stdlib.h\
                  sys/types.h sys/stat.h sys/param.h \
                  machine/endian.h fcntl.h \
@@ -183,6 +158,12 @@
 AC_CHECK_LIB(dl,dlsym,[LIBDL="-ldl"])
 AC_SUBST(LIBDL)
 
+dnl dlcompat has a function that's a drop-in replacement
+dnl for dlsym that will automatically prepend underscores on a failed lookup
+DLSYM_UNDERSCORE=
+AC_CHECK_LIB(dl,dlsym_prepend_underscore,[DLSYM_UNDERSCORE="-Ddlsym=dlsym_prepend_underscore"])
+AC_SUBST(DLSYM_UNDERSCORE)
+
 AC_ARG_WITH(esd,
     [  --with-esd=DIR         where the ESound root is (DIR/include DIR/lib) ],
        esd_prefix="$withval"
@@ -193,7 +174,7 @@
 [
   esd=false;
   AC_MSG_CHECKING([for esd.h in little nooks and crannies])
-  for esd_include_dir in ${esd_prefix}/include /usr/include /usr/local/include; do
+  for esd_include_dir in ${esd_prefix}/include ${prefix}/include /usr/include /usr/local/include; do
     if test -f "${esd_include_dir}/esd.h"; then
       esd=true
       ESD_INCS="-I${esd_include_dir}"