diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 9c6c52302..8e6dc72a9 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ AC_DEFINE_UNQUOTED([XINE_MINOR], [$XINE_MINOR], [xine minor version number]) XINE_SUB=XINE_VERSION_SUB AC_SUBST(XINE_SUB) AC_DEFINE_UNQUOTED([XINE_SUB], [$XINE_SUB], [xine sub version number]) +XINE_PATCH=XINE_VERSION_PATCH +AC_SUBST(XINE_PATCH) +AC_DEFINE_UNQUOTED([XINE_PATCH], [$XINE_PATCH], [xine patch version number]) XINE_LT_CURRENT=__XINE_LT_CURRENT AC_SUBST(XINE_LT_CURRENT) @@ -153,6 +156,7 @@ dnl checks for programs dnl ------------------- AC_PROG_CC +AM_PROG_CC_C_O AC_GNU_SOURCE AC_ISC_POSIX @@ -468,6 +472,7 @@ CC_CHECK_CFLAGS([-Wstrict-aliasing=2], [warnflags="$warnflags -Wstrict-aliasing= CC_CHECK_CFLAGS([-Wchar-subscripts], [warnflags="$warnflags -Wchar-subscripts"]) CC_CHECK_CFLAGS([-Wmissing-declarations], [warnflags="$warnflags -Wmissing-declarations"]) CC_CHECK_CFLAGS([-Wmissing-prototypes], [warnflags="$warnflags -Wmissing-prototypes"]) +CC_CHECK_CFLAGS([-Wwrite-strings], [warnflags="$warnflags -Wwrite-strings"]) dnl Some combinations of gcc and glibc produce useless warnings on memset when dnl compiling with -Wpointer-arith, so check for this first. @@ -476,6 +481,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[int a; memset(&a, [warnflags="$warnflags -Wpointer-arith" AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +CC_CHECK_LDFLAGS([-Wl,--gc-sections], [GCSECTIONS="-Wl,--gc-sections"]) +AC_SUBST([GCSECTIONS]) + dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads dnl are requested, as different implementations are present; to avoid problems dnl use -Wl,-z,defs only for those platforms not behaving this way. @@ -980,16 +988,19 @@ makeexpand () { xinelibdir='${libdir}/xine' xinedatadir='${datadir}/xine' +pkgconfigdir='${libdir}/pkgconfig' AC_SUBST(xinelibdir) AC_SUBST(xinedatadir) +AC_SUBST(pkgconfigdir) -XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB" +XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH" XINE_FONTDIR="\${xinedatadir}/libxine$XINE_MAJOR/fonts" XINE_LOCALEDIR='${datadir}/locale' XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`" XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_LOCALEDIR="`makeexpand "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`" +XINE_PKGCONFIG_DIR="`makeexpand "$pkgconfigdir"`" if test "x$WIN32_SYS" = "xmingw32" -o "x$WIN32_SYS" = "xcygwin"; then dnl polish paths (MinGW runtime accepts both \ and / anyway) XINE_REL_PLUGINDIR="`echo "$XINE_REL_PLUGINDIR" | sed -e 's/\\//\\\\\\\\/g'`" @@ -1027,6 +1038,7 @@ AC_SUBST(XINE_LOCALEPATH) AC_SUBST(XINE_PLUGINDIR) AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) +AC_SUBST(XINE_PKGCONFIG_DIR) dnl Where aclocal m4 files should be installed xine_acflags='-I ${datarootdir}/aclocal' @@ -1152,21 +1164,23 @@ contrib/nosefart/Makefile contrib/vidix/Makefile contrib/vidix/drivers/Makefile include/Makefile -include/xine.h +include/xine/version.h lib/Makefile m4/Makefile m4/gettext/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh -misc/fonts/Makefile misc/libxine.pc misc/relchk.sh +misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile +src/audio_dec/Makefile src/combined/Makefile +src/combined/ffmpeg/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile @@ -1174,21 +1188,12 @@ src/input/libdvdnav/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile -src/libffmpeg/Makefile -src/libmpeg2/Makefile -src/libspudec/Makefile -src/libspucc/Makefile -src/libspucmml/Makefile -src/libspudvb/Makefile -src/libsputext/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile -src/libxinevdec/Makefile -src/libxineadec/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile @@ -1198,16 +1203,25 @@ src/post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile +src/spu_dec/Makefile +src/video_dec/Makefile +src/video_dec/libmpeg2/Makefile src/video_out/Makefile src/video_out/macosx/Makefile src/xine-utils/Makefile src/xine-engine/Makefile src/vdr/Makefile -win32/Makefile -win32/include/Makefile]) +win32/Makefile]) AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) AC_OUTPUT +dnl Guard against multiple inclusion +AH_TOP([#ifndef _XINE_CONFIGURE_H_ +#define _XINE_CONFIGURE_H_ +]) +AH_BOTTOM([#endif +]) + dnl --------------------------------------------- dnl Work around a suspected bug in libtool: dnl |