From 0b4837d185869fcf00df0dc5ac57b295ba6060c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 4 Nov 2014 09:56:39 +0000 Subject: [PATCH] some rearrangements; refs #33 --- configure.ac | 4 +--- m4/ax_check_qt.m4 | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index f2ad4f0..3928e37 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,5 @@ # $Id$ AC_CONFIG_MACRO_DIR([m4]) -#m4_include(ax_cxx_compile_stdcxx_11.m4) -#m4_include(ax_check_qt.m4) AC_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) AC_DEFUN([AX_DEFINE_DIR], [ prefix_NONE= @@ -75,7 +73,7 @@ AC_SUBST_FILE(README) CHANGE_LOG=ChangeLog AC_SUBST_FILE(CHANGE_LOG) -AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"configure.ac +AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'" # Get rid of that stupid -O2 -g options! CXXFLAGS="${CXXFLAGS:-}" diff --git a/m4/ax_check_qt.m4 b/m4/ax_check_qt.m4 index 673330f..9e99aa2 100644 --- a/m4/ax_check_qt.m4 +++ b/m4/ax_check_qt.m4 @@ -78,10 +78,4 @@ AC_DEFUN([AX_CXX_CHECK_QT], [ AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CXXFLAGS) - AX_CHECK_COMPILE_FLAG(-fPIC, [AM_CXXFLAGS+=" -fPIC"]) - AX_CHECK_COMPILE_FLAG(-DPIC, [AM_CXXFLAGS+=" -DPIC"]) - AX_CHECK_COMPILE_FLAG(-fPIE, [AM_CXXFLAGS+=" -fPIE"]) - AX_CHECK_LINK_FLAG(-fPIC, [LDFLAGS+=" -fPIC"]) - AX_CHECK_LINK_FLAG(-DPIC, [LDFLAGS+=" -DPIC"]) - AX_CHECK_LINK_FLAG(-fPIE, [LDFLAGS+=" -fPIE"]) ])