XX-10704 - Support fedora 19

Author: dhubler

Makefile.in

@@ -5,11 +5,9 @@ BUILDDIR = $(abspath @builddir@)
 SRC = $(abspath @srcdir@)
 
 PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_REVISION = $(shell $(SRC)/config/revision-gen @PACKAGE_VERSION@)
+PACKAGE_REVISION = @PACKAGE_REVISION@
 
-help-var.DISTRO=To run a command for a different target distro. Default: $(DISTRO). Complete list of available values: @ALL_DISTROS@
 DISTRO=@DISTRO@
-
 DISTRO_OS = $(word 1,$(subst -, ,$(DISTRO)))
 DISTRO_VER = $(word 2,$(subst -, ,$(DISTRO)))
 DISTRO_ARCH = $(word 3,$(subst -, ,$(DISTRO)))
@@ -27,37 +25,33 @@ PROJ = $(filter $(all),$(subst ., ,$@))
 proj = $(call lowercase,$(PROJ))
 PROJ_REVISION = $(shell cd $(SRC)/$(PROJ) && ./config/revision-gen @PACKAGE_VERSION@)
 
-default-first-target : help;
+default-first-target : help-basics;
 
 sipx.% :
 	$(MAKE) $(foreach P,$(sipx),$(P).$*)
 
 lib.% :
 	$(MAKE) $(foreach P,$(lib),$(P).$*)
 
-app.% :
-	$(MAKE) $(foreach P,$(app),$(P).$*)
-
-help.{sipx,lib}.list=list all sipx components
-app.list lib.list sipx.list : %.list :
+help.sipx.list = List all sipxecs projects considered in this build system. To add or remove, edit .modules-include or .modules-exclude
+lib.list sipx.list : %.list :
 	@echo $($*)
 
 include $(sort $(wildcard mak/*.mk))
 
-help-values.{1} = Any sipXecs package. For all sipXecs packages use 'sipx'. Complete list of sipXecs packages : $(sipx)
-help-values.{2} = Any dependency package. For all dependencies use 'lib'.  Complete list of dependencies : $(lib)
-help-values.{6} = Any sipXecs application. For all app use 'app'.  Complete list of app : $(app)
-
-.PHONY: help
-help:
-	@echo -e "\nCOMMON TARGETS\n==================="
-	@$(MAKE) --no-print-directory -s help.print
-	@echo -e "\nALLOWED VALUES\n==================="
-	@$(MAKE) --no-print-directory -s help-values.print
+help.help = Show this help screen plus more information on more targets and important make variables.
+.PHONY: help help-basics
+help : help-basics
+	@echo -e "\nADDITIONAL TARGETS\n==================="
+	@$(MAKE) --no-print-directory -s help-more.print
 	@echo -e "\nSPECIAL VARIABLES\n==================="
 	@$(MAKE) --no-print-directory -s help-var.print
 
-help-values.print help.print help-var.print: %.print :
+help-basics:
+	@echo -e "\nTARGETS\n==================="
+	@$(MAKE) --no-print-directory -s help.print
+
+help.print help-more.print help-var.print: %.print :
 	@$(foreach H,$(filter $*.%,$(sort $(.VARIABLES))), \
 	  echo "$$format_help" | Label="$(H:$*.%=%)" Text="$($(H))" bash;)
 

config/general.m4

@@ -198,7 +198,7 @@ AC_DEFUN([CHECK_CPPUNIT],
 [
     AM_PATH_CPPUNIT(1.9,
       [],
-      [AC_MSG_ERROR("cppunit headers not found")]
+      [SF_MISSING_DEP("cppunit headers not found")]
     )
 ])
 
@@ -232,7 +232,7 @@ AC_DEFUN([CHECK_SSL],
         fi
     done
     if test x_$found_ssl_inc != x_yes ; then
-        AC_MSG_ERROR(['openssl/ssl.h' not found; tried ${tried_path}])
+        SF_MISSING_DEP(['openssl/ssl.h' not found; tried ${tried_path}])
     else
         AC_MSG_RESULT($sslincdir)
         HAVE_SSL=yes
@@ -273,7 +273,7 @@ AC_DEFUN([CHECK_SSL],
     done
 
     if test x_$found_ssl_lib != x_yes ; then
-        AC_MSG_ERROR(['libssl.so' not found; tried $openssl_path, each with lib, lib/openssl, and lib/ssl])
+        SF_MISSING_DEP(['libssl.so' not found; tried $openssl_path, each with lib, lib/openssl, and lib/ssl])
     else
         AC_MSG_RESULT($ssllibdir)
        if test x_"`uname -s`" = x_SunOS ; then
@@ -303,7 +303,7 @@ AC_DEFUN([CHECK_SSL],
       done
     fi
     if test x_$krb_found = x_no; then
-        AC_MSG_RESULT(['kerberos krb5.h' not found - looked in /usr/include $openssl_path])
+        SF_MISSING_DEP(['kerberos krb5.h' not found - looked in /usr/include $openssl_path])
     fi
 
     AC_SUBST(SSL_CFLAGS,"$SSL_CFLAGS")
@@ -313,10 +313,10 @@ AC_DEFUN([CHECK_SSL],
 # ============ P O C O  =========================
 AC_DEFUN([CHECK_POCO],
 [
-    AC_CHECK_LIB(PocoFoundation, main,[], [AC_MSG_ERROR("Poco C++ Library not found")])
-    AC_CHECK_LIB(PocoXML, main,[], [AC_MSG_ERROR("PocoXML C++ Library not found")])
-    AC_CHECK_LIB(PocoUtil, main,[], [AC_MSG_ERROR("PocoUtil C++ Library not found")])
-    AC_CHECK_LIB(PocoNet, main,[], [AC_MSG_ERROR("PocoNet C++ Library not found")])
+    AC_CHECK_LIB(PocoFoundation, main,[], [SF_MISSING_DEP("Poco C++ Library not found")])
+    AC_CHECK_LIB(PocoXML, main,[], [SF_MISSING_DEP("PocoXML C++ Library not found")])
+    AC_CHECK_LIB(PocoUtil, main,[], [SF_MISSING_DEP("PocoUtil C++ Library not found")])
+    AC_CHECK_LIB(PocoNet, main,[], [SF_MISSING_DEP("PocoNet C++ Library not found")])
     AC_SUBST(POCO_LIBS, "-lPocoNet -lPocoUtil -lPocoXML -lPocoFoundation")
 ])
 
@@ -408,7 +408,7 @@ AC_DEFUN([CHECK_XERCES],
     done
 
     if test x_$found_xerces != x_yes; then
-        AC_MSG_ERROR([Cannot find xerces - looked for include/xercesc/dom/DOMBuilder.hpp or /include/xercesc/dom/DOMBuilder.hpp in $xerces_path])
+        SF_MISSING_DEP([Cannot find xerces - looked for include/xercesc/dom/DOMBuilder.hpp or /include/xercesc/dom/DOMBuilder.hpp in $xerces_path])
     else
         AC_MSG_RESULT($xercesdirm)
         AC_SUBST(XERCES_CFLAGS,"$XERCES_CFLAGS")
@@ -451,7 +451,7 @@ AC_DEFUN([CHECK_APACHE2],
        AC_MSG_RESULT($apache2_httpd)
        AC_SUBST(APACHE2_HTTPD, $apache2_httpd)
    else
-       AC_MSG_ERROR('httpd' not found; tried: $apache2_bin_search_path)
+       SF_MISSING_DEP('httpd' not found; tried: $apache2_bin_search_path)
    fi
 
    ## APACHE2_VERSION is the Apache version number.
@@ -474,7 +474,7 @@ AC_DEFUN([CHECK_APACHE2],
    *)
       apache2_host_access="UNKNOWN"
       apache2_mod_access="UNKNOWN"
-      AC_MSG_ERROR(Unknown apache version $apache2_version)
+      SF_MISSING_DEP(Unknown apache version $apache2_version)
       ;;
    esac
    AC_MSG_RESULT($apache2_host_access = $apache2_mod_access)
@@ -523,7 +523,7 @@ AC_DEFUN([CHECK_APACHE2],
        AC_SUBST(APACHE2_MOD, $apache2_mod_override)
        AC_MSG_WARN('$apache2_mod_access', 'mod_cgi.so', and 'httpd.exp' not found; using explicit value: $tried_path)
    else
-       AC_MSG_ERROR('$apache2_mod_access' and 'httpd.exp' not found; tried: $tried_path)
+       SF_MISSING_DEP('$apache2_mod_access' and 'httpd.exp' not found; tried: $tried_path)
    fi
 
    apache2_home=`dirname ${apache2_moddir}`
@@ -624,10 +624,10 @@ AC_DEFUN([CHECK_PCRE],
     # Test that we've been able to find both directories, and set the various
     # makefile variables.
     if test x_$found_pcre_include != x_yes; then
-        AC_MSG_ERROR(Cannot find pcre.h - looked in $includeval)
+        SF_MISSING_DEP(Cannot find pcre.h - looked in $includeval)
     else
         if test x_$found_pcre_lib != x_yes; then
-            AC_MSG_ERROR(Cannot find libpcre.so or libpcre.a libraries - looked in $libval)
+            SF_MISSING_DEP(Cannot find libpcre.so or libpcre.a libraries - looked in $libval)
         else
             ## Test for version
 	    if test x$homeval != x; then
@@ -637,7 +637,7 @@ AC_DEFUN([CHECK_PCRE],
             fi
             AX_COMPARE_VERSION([$pcre_ver],[ge],[4.5],
                                [AC_MSG_RESULT($pcre_ver is ok)],
-                               [AC_MSG_ERROR([pcre version must be >= 4.5 - found $pcre_ver])])
+                               [SF_MISSING_DEP([pcre version must be >= 4.5 - found $pcre_ver])])
 
             AC_MSG_RESULT([    pcre includes found in $includeval])
             AC_MSG_RESULT([    pcre libraries found in $libval])
@@ -1170,10 +1170,10 @@ AC_DEFUN([CHECK_ODBC],
     # Test that we've been able to find both directories, and set the various
     # makefile variables.
     if test x_$found_odbc_include != x_yes; then
-        AC_MSG_ERROR(Cannot find sql.h - looked in $includeval)
+        SF_MISSING_DEP(Cannot find sql.h - looked in $includeval)
     else
         if test x_$found_odbc_lib != x_yes; then
-            AC_MSG_ERROR(Cannot find libodbc.so or libodbc.a libraries - looked in $libval)
+            SF_MISSING_DEP(Cannot find libodbc.so or libodbc.a libraries - looked in $libval)
         else
             ## Test for version
             odbc_ver=`odbcinst --version`

config/revision-gen

@@ -13,16 +13,16 @@ if test -f ./tarball-revision; then
     cat ./tarball-revision
     exit
 fi
-case $1 in
-  -s )
-    shift
-    sdir=$1
-    shift
-    abs_path=`readlink -f $0`
-    parent=`cd $sdir; $abs_path $@`
-    parent_rev=${parent%.*}
-    ;;
-esac
+
+# projects that are submodules should add to their parent's revision otherwise 
+# if there is a rebuild because a dependency triggered a reinstall then package
+# wouldn't be a new revision number and not trigger reinstall on update
+if test -d ../.git; then
+  abs_path=`readlink -f $0`
+  parent=`cd ..; $abs_path $@`
+  parent_rev=${parent%.*}
+fi
+
 VERSION=$1
 VER_REV=`git describe --abbrev=5 --match="v${VERSION}" HEAD`
 if [ "$?" != "0" ]; then

config/sipXlib.m4

@@ -2,6 +2,16 @@
 ## Libs from SipFoundry
 ##
 
+AC_ARG_ENABLE(dep-check,
+  AS_HELP_STRING([--disable-dep-check],
+  [Do not check for dependencies other then those required for dist target]))
+
+AC_DEFUN([SF_MISSING_DEP],[
+  if test "x$enable_dep_check" != "xno"; then
+    AC_MSG_ERROR([$1])
+  fi
+])
+
 ## Common C and C++ flags for pingtel related source
 AC_DEFUN([SFAC_INIT_FLAGS],
 [

config/sipXlib2.m4

@@ -42,15 +42,18 @@ test -n "$SIPXPBXUSER" || SIPXPBXUSER=$USER
 AC_ARG_VAR(SIPXPBXGROUP, [The sipX service daemon group name, default is value of SIPXPBXUSER])
 test -n "$SIPXPBXGROUP" || SIPXPBXGROUP=$SIPXPBXUSER
 
-AC_ARG_VAR(PACKAGE_REVISION, [Package revision number, default is pulled from git])
-if test -z "$PACKAGE_REVISION" ; then
-  # Submodules need to add the number of commits of parent plus the number of commits
-  # to their repository. Otherwise a rebuild may not increase revision and fresh rpm
-  # silently not installed.
-  if test -d "${srcdir}/.git" ; then
-    SUBMOD_OPT="-s .."
-  fi
-  PACKAGE_REVISION=`cd ${srcdir} && ./config/revision-gen ${SUBMOD_OPT} ${PACKAGE_VERSION}`
+AC_ARG_VAR(PACKAGE_REVISION, [Package revision number. Default is based on date rpm is built. Allowed values: stable, unstable, developer or supply your own value of command.])
+if test -z "$PACKAGE_REVISION" || test "$PACKAGE_REVISION" == "developer" ; then
+  PACKAGE_REVISION=`date +%Y%m%d%H%M%S`
+else
+  case ${PACKAGE_REVISION} in
+    unstable )
+      PACKAGE_REVISION=0`date +%Y%m%d%H%M%S`
+      ;;
+    stable )
+      PACKAGE_REVISION=`cd ${srcdir} && ./config/revision-gen ${PACKAGE_VERSION}`
+      ;;
+    esac
 fi
 AC_DEFINE_UNQUOTED([PACKAGE_REVISION], "${PACKAGE_REVISION}", [Revion number including git SHA])
 
@@ -61,12 +64,3 @@ AC_SUBST(IFDEF, [ifdef])
 AC_SUBST(IFNDEF, [ifndef])
 AC_SUBST(ENDIF, [endif])
 
-AC_ARG_ENABLE(dep-check,
-  AS_HELP_STRING([--disable-dep-check],
-  [Do not check for dependencies other then those required for dist target]))
-
-AC_DEFUN([SF_MISSING_DEP],[
-  if test "x$enable_dep_check" != "xno"; then
-    AC_MSG_ERROR([$1])
-  fi
-])

configure.ac

@@ -15,7 +15,7 @@ for a in $@; do
     --prefix*)OPTIONS+=" $a" ;;
     --disable-dep-check*)OPTIONS+=" $a" ;;
     --enable-debug*)OPTIONS+=" $a" ;;
-    PACKAGE_REVISION*)OPTIONS+=" $a" ;;        
+    PACKAGE_REVISION*)OPTIONS+=" $a" ;;
   esac
 done
 AC_SUBST(OPTIONS)
@@ -30,6 +30,7 @@ m4_sinclude([custom/custom.m4])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([mak/05-build.mk:mak/build.mk.in])
 AC_CONFIG_FILES([mak/20-list-dependencies.mk:mak/list-dependencies.mk.in])
+AC_CONFIG_FILES([mak/30-setup.mk:mak/setup.mk.in])
 
 AC_OUTPUT