some rearrangements; refs #33

master
Marc Wäckerlin 10 years ago
parent 47e6f434a9
commit 0b4837d185
  1. 4
      configure.ac
  2. 6
      m4/ax_check_qt.m4

@ -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:-}"

@ -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"])
])

Loading…
Cancel
Save