Commit e99c43e7 authored by Håkan Hjort's avatar Håkan Hjort
Browse files

Move the '-Wall -Werror' CFLAGS to the end of the configure script so that

they don't confuse cofigure it self. They caused lot of test to fail for
me resulting in faild build.
Change the configure tests for mediaLib to wokr correctly when it isn't
located in you default path or in LD_LIBRARY_PATH. Should now work with
Sun CC too.
parent 65e631c2
...@@ -14,9 +14,9 @@ AC_PROG_GCC_TRADITIONAL ...@@ -14,9 +14,9 @@ AC_PROG_GCC_TRADITIONAL
dnl GCC-specific flags dnl GCC-specific flags
if test x"$GCC" = x"yes"; then if test x"$GCC" = x"yes"; then
dnl compiler warnings dnl compiler warnings (disabled to not confuse autoconf, test at the end)
OPT_CFLAGS="$CFLAGS -Wall -Werror" dnl OPT_CFLAGS="$CFLAGS -Wall -Werror"
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) dnl AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
dnl -O3 dnl -O3
changequote(<<,>>) changequote(<<,>>)
...@@ -54,7 +54,7 @@ else ...@@ -54,7 +54,7 @@ else
mips-sgi-irix6.*) mips-sgi-irix6.*)
OPT_CFLAGS="$CFLAGS -64" OPT_CFLAGS="$CFLAGS -64"
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
sparc-solaris-*) sparc-sun-solaris-*)
OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
esac esac
...@@ -83,4 +83,11 @@ dnl Checks for library functions. ...@@ -83,4 +83,11 @@ dnl Checks for library functions.
builtin([include],[libmpeg2/configure.incl]) builtin([include],[libmpeg2/configure.incl])
builtin([include],[libvo/configure.incl]) builtin([include],[libvo/configure.incl])
if test x"$GCC" = x"yes"; then
dnl compiler warnings
OPT_CFLAGS="$CFLAGS -Wall -Werror"
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
fi
AC_OUTPUT(Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile libmpeg2/Makefile libvo/Makefile) AC_OUTPUT(Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile libmpeg2/Makefile libvo/Makefile)
...@@ -5,9 +5,11 @@ dnl check for mlib ...@@ -5,9 +5,11 @@ dnl check for mlib
AC_ARG_ENABLE([mlib], AC_ARG_ENABLE([mlib],
[ --disable-mlib make a version not using mediaLib]) [ --disable-mlib make a version not using mediaLib])
if test x"$enable_mlib" != x"no"; then if test x"$enable_mlib" != x"no"; then
cflags_save="$CFLAGS"
CFLAGS="$CFLAGS -L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib"
AC_CHECK_LIB([mlib],[mlib_VideoColorYUV2RGB420], AC_CHECK_LIB([mlib],[mlib_VideoColorYUV2RGB420],
[AC_DEFINE([LIBMPEG2_MLIB],,[libmpeg2 mlib support]) [AC_DEFINE([LIBMPEG2_MLIB],,[libmpeg2 mediaLib support])
LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -I/opt/SUNWmlib/include" LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -I/opt/SUNWmlib/include"
LIBMPEG2_LIBS="$LIBMPEG2_LIBS -L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib -lmlib"],, LIBMPEG2_LIBS="$LIBMPEG2_LIBS -L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib -lmlib"])
[-L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib]) CFLAGS="$cflags_save"
fi fi
...@@ -25,11 +25,13 @@ dnl check for mlib ...@@ -25,11 +25,13 @@ dnl check for mlib
AC_ARG_ENABLE([mlib], AC_ARG_ENABLE([mlib],
[ --disable-mlib make a version not using mediaLib]) [ --disable-mlib make a version not using mediaLib])
if test x"$enable_mlib" != x"no"; then if test x"$enable_mlib" != x"no"; then
cflags_save="$CFLAGS"
CFLAGS="$CFLAGS -L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib"
AC_CHECK_LIB([mlib],[mlib_VideoColorYUV2RGB420], AC_CHECK_LIB([mlib],[mlib_VideoColorYUV2RGB420],
[AC_DEFINE([LIBVO_MLIB],,[libvo mlib support]) [AC_DEFINE([LIBVO_MLIB],,[libvo mediaLib support])
LIBVO_CFLAGS="$LIBVO_CFLAGS -I/opt/SUNWmlib/include" LIBVO_CFLAGS="$LIBVO_CFLAGS -I/opt/SUNWmlib/include"
LIBVO_LIBS="$LIBVO_LIBS -L/opt/SUNWmlib/lib -lmlib"],, LIBVO_LIBS="$LIBVO_LIBS -L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib -lmlib"])
[-L/opt/SUNWmlib/lib]) CFLAGS="$cflags_save"
fi fi
dnl following drivers are unsupported - dont expect them to compile or work dnl following drivers are unsupported - dont expect them to compile or work
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment