diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-02-05 21:36:07 +0100 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-02-05 21:36:07 +0100 |
| commit | 7f08dcfc78675bed63f962f6d01cfb18264e12c7 (patch) | |
| tree | db54c9dc0279b43c1eedea09512ec60ecb3c94e9 /acinclude.m4 | |
| parent | b541fedc97ad4ed5e658ce34ee50c74ad756f330 (diff) | |
Imported Upstream version 3.7.1
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cccd411..aaf8ccb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -81,12 +81,12 @@ AC_REQUIRE([AC_C_BIGENDIAN]) AC_REQUIRE([AC_SYS_LARGEFILE]) if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe" + CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations" if test "x$HAVE_DARWIN" = "xyes"; then - CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe" + CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations" LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++" else - CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe" + CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations" fi AUD_CHECK_CFLAGS(-Wtype-limits) AUD_CHECK_CXXFLAGS(-Woverloaded-virtual) @@ -107,13 +107,13 @@ fi dnl Enable "-Wl,-z,defs" only on Linux dnl ================================== if test $HAVE_LINUX = yes ; then - LDFLAGS="$LDFLAGS -Wl,-z,defs" + LDFLAGS="$LDFLAGS -Wl,-z,defs" fi dnl MinGW needs -march=i686 for atomics dnl =================================== if test $HAVE_MSWINDOWS = yes ; then - CFLAGS="$CFLAGS -march=i686" + CFLAGS="$CFLAGS -march=i686" fi dnl Byte order @@ -173,7 +173,7 @@ AC_SUBST(USE_GTK) if test $HAVE_MSWINDOWS = yes ; then PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32) else - PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32) + PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32) fi AC_SUBST(GLIB_CFLAGS) @@ -193,10 +193,12 @@ AC_ARG_ENABLE(qt, USE_QT=$enableval, USE_QT=no) if test $USE_QT = yes ; then - PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets]) + PKG_CHECK_MODULES([QTCORE], [Qt5Core >= 5.2]) + PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets >= 5.2]) AC_DEFINE(USE_QT, 1, [Define if Qt support enabled]) # needed if Qt was built with -reduce-relocations + QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC" QT_CFLAGS="$QT_CFLAGS -fPIC" fi |