repair rpm build

2015-07-31 07:00:50 +00:00
parent 065ca407c4
commit 63dc0afd00
6 changed files with 416 additions and 85 deletions
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -3,45 +3,46 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

+# m4_esyscmd_s does not exist on centos 5 and 6
+m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
+
 # define least version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
-m4_define(x_least, m4_esyscmd_s(
+m4_define(x_least, mrw_esyscmd_s([
  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
  for path in . .. ../..; do
    if svn info $path 2>&1 > /dev/null; then
      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      (cd $path && svn2cl)
      break;
    fi
  done
  # Mac does not support LEAST > 255
  echo $ECHO_N $(($SVN_REVISION%256))
-))
+]))
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
 # add to x_minor if revision number is > 256
-m4_define(x_minor_fixed, m4_esyscmd_s(
+m4_define(x_minor_fixed, mrw_esyscmd_s([
  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
  for path in . .. ../..; do
    if svn info $path 2>&1 > /dev/null; then
      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      (cd $path && svn2cl)
      break;
    fi
  done
  # Mac does not support LEAST > 255
  echo $ECHO_N $((x_minor+$SVN_REVISION/256))
-))
+]))
 # setup version number
-m4_define(x_version, m4_esyscmd_s(
+m4_define(x_version, mrw_esyscmd_s([
  echo $ECHO_N x_major.x_minor_fixed.x_least
-))
+]))

 ## bugreport mail address is taken from <user@host> in first line of AUTHORS
-m4_define(x_bugreport, m4_esyscmd_s(
+m4_define(x_bugreport, mrw_esyscmd_s([
  head -1 AUTHORS | \
    sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp'
-))
+]))

 m4_include(ax_check_qt.m4)

@@ -84,7 +85,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
 #     $1 = variable name
 AC_DEFUN([AX_SUBST], [
  AC_SUBST([$1])
-  tmp_var=$(echo "${$1}" | awk 1 ORS='\\n')
+  tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
  tmp_var=${tmp_var//\"/\\\"}
  tmp_var=${tmp_var//\'/\'\"\'\"\'}
  tmp_var=${tmp_var//#/\\#}
@@ -108,7 +109,15 @@ AC_DEFUN([AX_SUBST], [
 #
 # configures the basic environment
 AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
-  AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'"
+  MINGW=no
+  MAC=no
+  case $host in
+    *mingw*) MINGW=yes;;
+    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
+  esac
+  AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
+  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
+  AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
  AX_SUBST(NUMBERS)
  AX_SUBST(HOME)
  README=$(tail -n +3 README)
@@ -134,6 +143,21 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
     PROJECT_ICON="${PROJECT_NAME}-icon.png"
  fi
  AX_SUBST(PROJECT_ICON)
+
+  AC_ARG_ENABLE(pedantic,
+    [AS_HELP_STRING([--enable-pedantic],
+                    [enable all warnings and checks, abort on warnings])],
+    [have_pedantic="$enableval"; test "$enableval" = "yes" &&  \
+       AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"])
+  dnl problem in libs: -Wshadow -Wcast-qual
+  dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
+  AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
+  if test "$have_pedantic" == "yes"; then
+    AC_MSG_NOTICE([Pedantic compile mode enabled!
+     - all warnings for GNU g++ are enabled
+     - all warnings result in an error
+     - doxygen warnings are treated as error too]); fi
+
  AC_CONFIG_FILES([makefile])
  AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
@@ -141,7 +165,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
 EXTRA_DIST = bootstrap.sh
-doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 clean-standard-project-targets:
 	-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
 	-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz
@@ -167,42 +190,29 @@ AC_DEFUN([AX_USE_CXX], [
  AM_CPPFLAGS+=' -I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}'
  AM_LDFLAGS+=' -L ${top_srcdir}/src -L ${top_builddir}/src'

-  # Get rid of that stupid -O2 -g opions!
-  CXXFLAGS="${CXXFLAGS:-}"
+  # Get rid of those stupid -g -O2 options!
+  CXXFLAGS="${CXXFLAGS//-g -O2/}"
+  CFLAGS="${CFLAGS//-g -O2/}"

 # pass compile flags to make distcheck
  AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
  AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)

-  AC_ARG_ENABLE(pedantic,
-    [AS_HELP_STRING([--enable-pedantic],
-                    [enable all warnings and checks, abort on warnings])],
-    [have_pedantic="$enableval"; test "$enableval" = "yes" &&  \
-       AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"])
-  dnl problem in libs: -Wshadow -Wcast-qual
-  dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
-  AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
-  if test "$have_pedantic" == "yes"; then
-    AC_MSG_NOTICE([Pedantic compile mode enabled!
-     - all warnings for GNU g++ are enabled
-     - all warnings result in an error
-     - doxygen warnings are treated as error too]); fi
-
-  MINGW32=no
-  MAC=no
-  case $host_os in
-    *mingw32*) MINGW32=yes;;
-    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
-  esac
-  AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes")
-  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
-  
  AC_SUBST(AM_CXXFLAGS)
  AC_SUBST(AM_CPPFLAGS)
  AC_SUBST(AM_LDFLAGS)
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cxx-targets], [src/makefile.in])
  test -f src/makefile.in && cat >> src/makefile.in <<EOF
 #### Begin: Appended by $0
+%.app: %
+	-rm -r [\$][@]
+	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
+	QTDIR="\${QTDIR}" \
+	QT_PLUGINS="\${QT_PLUGINS}" \
+	QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \
+	  \${top_builddir}/mac-create-app-bundle.sh \
+	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
+
 maintainer-clean-cxx-targets:
 	-rm makefile.in
 #### End: $0
@@ -302,14 +312,16 @@ EOF

 # use this in configure.ac to support RPM packages
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
-#  m4_include(ax_rpm_rules.m4)
  AC_CONFIG_FILES([${PACKAGE_NAME}.spec])
-  #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-debian-targets], [makefile.in])
-  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [rpm], [makefile.in])
+  #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-rpm-targets], [makefile.in])
  test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
+EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
-	rpmbuild -ba --define "_topdir \$(pwd)" --define "_sourcedir \$(pwd)" \${PACKAGE_NAME}.spec
+	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
+distclean-rpm-targets:
+	-rm \${PACKAGE_NAME}.spec
 #### End: $0
 EOF
 ])
@@ -355,7 +367,7 @@ doc: doxyfile
 clean-documentation:
 	-rm doxygen.errors @PDF_DOC@
 distclean-documentation:
-	-rm -r html latex
+	-rm -r html
 	-rm  @PACKAGE_NAME@.doxytag
 maintainer-clean-documentation:
 	-rm makefile.in
@@ -365,7 +377,7 @@ install-data-documentation:
 	cp -r html \$(DESTDIR)\${docdir}/
 uninstall-documentation:
 	-chmod -R u+w \$(DESTDIR)\${docdir}
-	-rm -rf \$(DESTDIR)\${docdir}/*
+	-rm -rf \$(DESTDIR)\${docdir}/html
 #### End: $0
 EOF
 ])
@@ -407,18 +419,22 @@ AC_DEFUN([AX_PKG_REQUIRE], [
  AC_SUBST(CXXFLAGS)
  AC_SUBST(PKG_REQUIREMENTS)
  if test -n "$3"; then
-    tmp_package=${$1_found}
+    if test "${$1_found}" = "no"; then
+      tmp_package="yes"
+    else
+      tmp_package=${$1_found}
+    fi
    $1_found=no
    old_CPPFLAGS=${CPPFLAGS}
    CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}"
    AC_CHECK_HEADER([$3], [
-      $1_found=yes
+      $1_found=${tmp_package}
    ], [
      for x in ${$1_CFLAGS}; do
        AC_MSG_NOTICE([search for $3 in ${x[#]-I}])
        for f in $(find ${x[#]-I} -name "$3"); do
          if test -f "$f"; then
-            $1_found=yes
+            $1_found=${tmp_package}
            $1_CFLAGS+=" -I${f%/*}"
            AC_MSG_NOTICE([added path ${f%/*}])
            break;
@@ -429,12 +445,12 @@ AC_DEFUN([AX_PKG_REQUIRE], [
        fi
      done
      if test "${$1_found}" = "no"; then
-        tmp_includedir=$(pkg-config --variable=includedir $tmp_package)
+        tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package)
        for x in ${tmp_includedir}; do
          AC_MSG_NOTICE([search for $3 in $x])
          for f in $(find ${x} -name "$3"); do
            if test -f "$f"; then
-              $1_found=yes
+              $1_found=${tmp_package}
              $1_CFLAGS+=" -I${f%/*}"
              AC_MSG_NOTICE([added path ${f%/*}])
              break;