mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

use $libdir so that it does the right thing on 64bit

Browse source 
Original commit message from CVS:
use $libdir so that it does the right thing on 64bit
This commit is contained in:
Thomas Vander Stichele 2004-03-05 09:28:03 +00:00
parent 5fba054547
commit 65ff7c960b
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-03-05 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: use ${libdir} for PLUGINS_DIR since on 64bit
it contains lib64; use AS_AC_EXPAND to handle it properly
2004-03-05 David Schleef <ds@schleef.org> 2004-03-05 David Schleef <ds@schleef.org>
* gst/gstcpuid_i386.s: Remove unused code * gst/gstcpuid_i386.s: Remove unused code

10
configure.ac
View file

@ -23,9 +23,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0 dnl - interfaces removed -> AGE = 0
AS_LIBTOOL(GST, 7, 0, 1) AS_LIBTOOL(GST, 7, 0, 1)
echo libtool
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
echo libtool done
AC_CONFIG_SRCDIR([gst/gst.c]) AC_CONFIG_SRCDIR([gst/gst.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
@ -37,7 +35,6 @@ AM_PROG_CC_STDC
AM_PROG_AS AM_PROG_AS
AS="${CC}" AS="${CC}"
echo gettext
dnl the gettext stuff needed dnl the gettext stuff needed
AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
@ -522,13 +519,10 @@ AC_MSG_NOTICE(Using $GST_ORIGIN as package origin)
AC_DEFINE_UNQUOTED(GST_ORIGIN, "$GST_ORIGIN", [package origin]) AC_DEFINE_UNQUOTED(GST_ORIGIN, "$GST_ORIGIN", [package origin])
dnl Set location of plugin directory dnl Set location of plugin directory
if test "x${prefix}" = "xNONE"; then AS_AC_EXPAND(PLUGINS_DIR, ${libdir}/gstreamer-$GST_MAJORMINOR)
PLUGINS_DIR=${ac_default_prefix}/lib/gstreamer-$GST_MAJORMINOR
else
PLUGINS_DIR=${prefix}/lib/gstreamer-$GST_MAJORMINOR
fi
AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory]) AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory])
AC_SUBST(PLUGINS_DIR) AC_SUBST(PLUGINS_DIR)
AC_MSG_NOTICE([Using $PLUGINS_DIR as the plugin install location])
dnl Set location of uninstalled plugin directory dnl Set location of uninstalled plugin directory
PLUGINS_BUILDDIR=`pwd` PLUGINS_BUILDDIR=`pwd`