← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_vc_build.m4

Added code necessary for building plugins dynamically.
Merged in changes from lifeless to allow autoreconf to work.
Touching plugin.ini files now triggers a rebuid - so config/autorun.sh is no
longer required to be run after touching those.
Removed the duplicate plugin names - also removed the issue that getting them
different would silently fail weirdly later.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_vc_build.m4
84
84
  AS_IF([test "${ac_cv_building_from_bzr}" = "yes"],[
85
85
dnl  echo "Grabbing changelog and version information from bzr"
86
86
dnl  bzr log --short > ChangeLog || touch ChangeLog
87
 
    BZR_REVNO=`bzr revno`
88
 
    AS_IF([test "x$BZR_REVNO" != "${PANDORA_VC_REVNO}"],[
89
 
      PANDORA_VC_REVNO="${BZR_REVNO}"
 
87
    PANDORA_BZR_REVNO=`bzr revno`
 
88
    AS_IF([test "x$PANDORA_BZR_REVNO" != "${PANDORA_VC_REVNO}"],[
 
89
      PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
90
90
      PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | awk '{print $[]2}' | head -1`
91
91
      PANDORA_VC_BRANCH=`bzr nick`
92
92
      AS_IF([test "x${PANDORA_VC_BRANCH}" != "${PACKAGE}"],[
96
96
      ])
97
97
    ])
98
98
  ])
99
 
  cat > "${srcdir}/config/bzr_revinfo" <<EOF
 
99
  AS_IF([! test -d config],[mkdir -p config])
 
100
  cat > "config/bzr_revinfo" <<EOF
100
101
PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
101
102
PANDORA_VC_REVID=${PANDORA_VC_REVID}
102
103
PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
109
110
  PANDORA_RELEASE_ID="${PANDORA_RELEASE_NODOTS_DATE}${PANDORA_VC_REVNO}"
110
111
 
111
112
  VERSION="${PANDORA_RELEASE_VERSION}"
 
113
  AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["${PANDORA_RELEASE_VERSION}"],
 
114
                     [The real version of the software])
112
115
  AC_SUBST(PANDORA_VC_REVNO)
113
116
  AC_SUBST(PANDORA_VC_REVID)
114
117
  AC_SUBST(PANDORA_VC_BRANCH)