some rearrangements; refs #33

10 years ago · 47e6f434a9
parent 6df98280bb
commit 47e6f434a9
3 changed files with 4 additions and 3 deletions
--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,7 @@
 # $Id$
-m4_include(ax_cxx_compile_stdcxx_11.m4)
-m4_include(ax_check_qt.m4)
+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=
@ -74,7 +75,7 @@ AC_SUBST_FILE(README)
 CHANGE_LOG=ChangeLog
 AC_SUBST_FILE(CHANGE_LOG)

-AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"
+AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"configure.ac

 # Get rid of that stupid -O2 -g options!
 CXXFLAGS="${CXXFLAGS:-}"
--- a/m4/ax_check_qt.m4
+++ b/m4/ax_check_qt.m4
--- a/m4/ax_cxx_compile_stdcxx_11.m4
+++ b/m4/ax_cxx_compile_stdcxx_11.m4