alsa-lib: import from packages

This commit is contained in:
Peter Wagner
2014-06-30 15:28:40 +02:00
parent 29a8acab1f
commit 5a6ac78c5a
3 changed files with 145 additions and 0 deletions
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/Makefile.in b/src/Makefile.in
index e21fc0d..c8f3ea0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -419,7 +419,7 @@ clean-libLTLIBRARIES:
rm -f $${locs}; \
}
libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/src/pcm/scopes/Makefile.in b/src/pcm/scopes/Makefile.in
index 469dbb5..391f3d4 100644
--- a/src/pcm/scopes/Makefile.in
+++ b/src/pcm/scopes/Makefile.in
@@ -348,7 +348,7 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES)
- $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+27
View File
@@ -0,0 +1,27 @@
diff --git a/configure.in b/configure.in
index 00fff2b..af39300 100644
--- a/configure.in
+++ b/configure.in
@@ -24,22 +24,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PREFIX_DEFAULT(/usr)
-dnl Checks for programs.
-
-dnl try to gues cross-compiler if not set
-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
-then
- AC_MSG_CHECKING(for cross-compiler)
-
- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
- && CC=${host_cpu}-${host_os}-gcc
- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
-
- AC_MSG_RESULT($CC)
-fi
-
CFLAGS="$CFLAGS -D_GNU_SOURCE"