diff options
author | Thomas Vander Stichele | 2002-12-08 08:50:10 -0600 |
---|---|---|
committer | Thomas Vander Stichele | 2002-12-08 08:50:10 -0600 |
commit | 708cf898e85bb1742870f6b3cabcc74b28f01c5f (patch) | |
tree | 022549fcd528cd742ef2fc6569ebd94a0030e97f /configure.ac | |
parent | 2a19514098f24c47f8642e7f0b4b762e5dc9d05d (diff) | |
download | gst-plugins-bad0-10-708cf898e85bb1742870f6b3cabcc74b28f01c5f.tar.gz gst-plugins-bad0-10-708cf898e85bb1742870f6b3cabcc74b28f01c5f.tar.xz gst-plugins-bad0-10-708cf898e85bb1742870f6b3cabcc74b28f01c5f.zip |
parallel install fixes
Original commit message from CVS:
parallel install fixes
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6e9958ede..cf981eb89 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -14,7 +14,17 @@ dnl when going to/from release please set the nano (fourth number) right ! | |||
14 | dnl releases only do Wall, cvs and prerelease does Werror too | 14 | dnl releases only do Wall, cvs and prerelease does Werror too |
15 | AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 4, 2, 1, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror") | 15 | AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 4, 2, 1, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror") |
16 | AM_INIT_AUTOMAKE($PACKAGE,$VERSION) | 16 | AM_INIT_AUTOMAKE($PACKAGE,$VERSION) |
17 | AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes) | 17 | |
18 | dnl our libraries and install dirs use major.minor as a version | ||
19 | GST_MAJORMINOR=$GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR | ||
20 | AC_SUBST(GST_MAJORMINOR) | ||
21 | |||
22 | dnl CURRENT, REVISION, AGE | ||
23 | dnl - library source changed -> increment REVISION | ||
24 | dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 | ||
25 | dnl - interfaces added -> increment AGE | ||
26 | dnl - interfaces removed -> AGE = 0 | ||
27 | AS_LIBTOOL(GST_PLUGINS, 1, 0, 0) | ||
18 | 28 | ||
19 | dnl FIXME take something else ? | 29 | dnl FIXME take something else ? |
20 | AC_CONFIG_SRCDIR([gst/law/alaw.c]) | 30 | AC_CONFIG_SRCDIR([gst/law/alaw.c]) |
@@ -136,19 +146,23 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ | |||
136 | ]) | 146 | ]) |
137 | 147 | ||
138 | dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1) | 148 | dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1) |
139 | PKG_CHECK_MODULES(GST, gstreamer >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO, | 149 | PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO, |
140 | HAVE_GST="yes", HAVE_GST="no") | 150 | HAVE_GST="yes", HAVE_GST="no") |
141 | 151 | ||
142 | if test "x$HAVE_GST" = "xno"; then | 152 | if test "x$HAVE_GST" = "xno"; then |
143 | AC_MSG_ERROR(no GStreamer found) | 153 | AC_MSG_ERROR(no GStreamer found) |
144 | fi | 154 | fi |
145 | 155 | ||
146 | GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer` | 156 | GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-$GST_MAJORMINOR` |
147 | if test -z $GST_TOOLS_DIR; then | 157 | if test -z $GST_TOOLS_DIR; then |
148 | AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.]) | 158 | AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.]) |
149 | fi | 159 | fi |
150 | AC_SUBST(GST_TOOLS_DIR) | 160 | AC_SUBST(GST_TOOLS_DIR) |
151 | 161 | ||
162 | dnl additional gstcontrol libs | ||
163 | GST_CONTROL_LIBS=`pkg-config --variable=gstcontrol_libs gstreamer-$GST_MAJORMINOR` | ||
164 | AC_SUBST(GST_CONTROL_LIBS) | ||
165 | |||
152 | dnl Set up conditionals for (target) architecture: | 166 | dnl Set up conditionals for (target) architecture: |
153 | dnl ============================================== | 167 | dnl ============================================== |
154 | 168 | ||