[Liboss-commit] CVS: liboss acconfig.h,1.1.1.1,1.2 configure.in,1.10,1.11

[Justin <th...@us...>]

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

Modified Files:
	acconfig.h configure.in 
Log Message:
Added the CoreAudio if statement

Index: acconfig.h
===================================================================
RCS file: /cvsroot/liboss/liboss/acconfig.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- acconfig.h	3 May 2002 16:19:55 -0000	1.1.1.1
+++ acconfig.h	10 May 2002 03:35:19 -0000	1.2
@@ -6,7 +6,10 @@
 #undef LIBOSS_MINOR
 #undef LIBOSS_SUB
 
-@BOTTOM@
+#undef HAVE_COREAUDIO
+
+@BOTTOM@H_TOP
+
 /* Disable GCC compiler extensions, if gcc is not in use */
 #ifndef	__GNUC__
 #define	__attribute__(x)	/*empty*/

Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in	9 May 2002 23:07:40 -0000	1.10
+++ configure.in	10 May 2002 03:35:19 -0000	1.11
@@ -3,11 +3,6 @@
 dnl
 AC_INIT(lib/liboss.c)
 
-dnl
-dnl Require libtool minimum version 1.4.0
-dnl
-dnl AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 installed ***))
-
 dnl Making releases:
 dnl   LIBOSS_SUB += 1;
 dnl   LIBOSS_IFACE_AGE += 1;
@@ -61,11 +56,21 @@
 
 dnl
 AC_CANONICAL_SYSTEM
-dnl AC_CANONICAL_HOST
 
 dnl
 AM_INIT_AUTOMAKE("liboss", $LIBOSS_MAJOR.$LIBOSS_MINOR.$LIBOSS_SUB$LIBOSS_PRE)
 
+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
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -74,15 +79,31 @@
 AC_PROG_RANLIB
 AC_PROG_LN_S
 
-dnl Common flags for all platforms
-CFLAGS="$CFLAGS -I$prefix/include"
+dnl Flags not supported by all *cc* variants
+AC_TRY_CFLAGS("-Wall", wall="-Wall", wall="")
+AC_TRY_CFLAGS("-no-cpp-precomp", nocpp="-no-cpp-precomp", nocpp="")
+
+dnl
+dnl debug cflags
+dnl
+AC_SUBST(DEBUG_CFLAGS)
+DEBUG_CFLAGS="-g -DDEBUG"
+
+dnl
+dnl Some include paths ( !!! DO NOT REMOVE !!! )
+dnl
+INCLUDES='-I$(top_srcdir) -I$(top_srcdir)/include'
+AC_SUBST(INCLUDES)
+
+dnl Common cflags for all platforms
+CFLAGS="$CFLAGS $nocpp $wall -I$prefix/include"
 CPPFLAGS="$CPPFLAGS $CFLAGS"
+DEBUG_CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 LDFLAGS="$LDFLAGS -L$prefix/lib"
 
 dnl
 dnl Libtool
 dnl
-AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
@@ -104,12 +125,6 @@
 AC_TYPE_SIZE_T
 
 dnl
-dnl debug cflags
-dnl
-AC_SUBST(DEBUG_CFLAGS)
-DEBUG_CFLAGS="-g -DDEBUG"
-
-dnl
 dnl Using or not using -fPIC (override default behavior - system dependent)
 dnl
 AC_ARG_ENABLE(fpic,
@@ -118,58 +133,20 @@
 
 AC_CHECK_HEADERS(errno.h string.h stdlib.h\
                  sys/types.h sys/stat.h sys/param.h \
-                 CoreAudio/CoreAudio.h \
                  machine/endian.h)
 
-COREAUDIO_LDFLAGS='-framework CoreAudio'
+dnl
+dnl CoreAudio
+dnl
+AC_CHECK_HEADER(CoreAudio/CoreAudio.h,
+[ have_coreaudio="yes"
+  COREAUDIO_LDFLAGS="-framework CoreAudio"
+  COREAUDIO_CFLAGS="-F/System/Library/Frameworks/Cocoa.framework"
+  AC_DEFINE(HAVE_COREAUDIO) ])
 AC_SUBST(COREAUDIO_LDFLAGS)
-
-COREAUDIO_CFLAGS='-F/System/Library/Frameworks/Cocoa.framework'
 AC_SUBST(COREAUDIO_CFLAGS)
 
 AC_SYS_LONG_FILE_NAMES
-
-dnl For the moment we will assume that all systems which have
-dnl the unixyness to run configure are unixy enough to do the
-dnl PreservePermissions stuff.  I have this sinking feeling that
-dnl things won't be that simple, before long.
-dnl AC_DEFINE(PRESERVE_PERMISSIONS_SUPPORT)
-
-dnl Flags not supported by all *cc* variants
-AC_TRY_CFLAGS("-Wall", wall="-Wall", wall="")
-AC_TRY_CFLAGS("-no-cpp-precomp", nocpp="-no-cpp-precomp", nocpp="")
-
-dnl
-dnl Some include paths ( !!! DO NOT REMOVE !!! )
-dnl
-INCLUDES='-I$(top_srcdir) -I$(top_srcdir)/include'
-AC_SUBST(INCLUDES)
-
-dnl Common cflags for all platforms
-CFLAGS="$CFLAGS $nocpp $wall"
-CPPFLAGS="$CPPFLAGS $nocpp $wall"
-DEBUG_CFLAGS="$CFLAGS $DEBUG_CFLAGS"
-LDFLAGS="$LDFLAGS"
-
-dnl
-dnl Get where .m4 should be installed.
-dnl
-case "`id`" in
-  uid=0\(* )
-    AC_MSG_CHECKING(for aclocal directory)
-    if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-      ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`"
-      AC_MSG_RESULT($ACLOCAL_DIR)
-    else
-      ACLOCAL_DIR="/usr/local/share/aclocal"
-      AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR)
-    fi
-    escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`"
-    ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`"
-    AC_SUBST(ACLOCAL_DIR)
-    ;;
-esac
-AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x")
 
 AC_OUTPUT([
 Makefile