Package: openjade
Version: 1.4devel1-21
Followup-For: Bug #748626
So I had a go at this following Peter's helpful start, however running
the autoinit: target to generate new autofoo with the extra acinclude
macro in fails for me with missing rpath. There is also a great deal
of noise complaining about the out-of-date configurey.
So I decided to fix up the worst of it to avoid potential
problems. Quoting the underquoted stuff and updating some of the
deprecated macros made it work a lot better, so that the missing files
were updated and a lot of the noise went.
The effect appear to be the same whether you stick with the existing manual
autoinit: sequence
aclocal
autoheader
libtoolize --force --copy
automake --add-missing --force-missing --copy
autoconf
or just use dh_autoreconf which I think does exactly the same thing.
So with the attached patch the configure goes OK and the build proceeds but
eventually stops with:
make[3]: Entering directory
'/home/buildd/packages/modified/openjade-1.4devel1/po'
make[3]: *** No rule to make target 'Makevars', needed by 'Makefile'. Stop.
There is also a prblem with configure corectly determining that wchar_t is
available, but definig it's size as 0 which is wrong.
In file included from ../style/stylelib.h:6:0,
from MessageModule.cxx:11:
../config.h:435:0: warning: "SIZEOF_WCHAR_T" redefined
#define SIZEOF_WCHAR_T 0
^
In file included from ../config.h:7:0,
from ../style/stylelib.h:6,
from MessageModule.cxx:11:
/usr/include/OpenSP/config.h:357:0: note: this is the location of the previous
definition
#define SIZEOF_WCHAR_T 4
^
in theconfigre:
...
checking for wchar_t... yes
...
checking size of wchar_t... 0
I've not yet worked out what's going on there.
I've run out of time for now so am documenting where I got to.
One odd thing is that the libosp package which jade uses ships the config.h
that configure generated in the -dev package, and it's included, so we get
piles of " warning: <blah> redefined, which doesn;t break anything but obscures
real issue (like the wchar_t thing)
g++ -DHAVE_CONFIG_H -I. -I.. -I../grove -I../spgrove -I../style -g --pipe
-fpermissive -O2 -MT MifFOTBuil....
In file included from MifFOTBuilder.cxx:29:0:
../config.h:402:0: warning: "PACKAGE_NAME" redefined
#define PACKAGE_NAME "OpenJade"
^
In file included from ../config.h:7:0,
from MifFOTBuilder.cxx:29:
/usr/include/OpenSP/config.h:318:0: note: this is the location of the previous
definition
#define PACKAGE_NAME ""
^
diff -u openjade-1.4devel1/acinclude.m4 openjade-1.4devel1/acinclude.m4
--- openjade-1.4devel1/acinclude.m4
+++ openjade-1.4devel1/acinclude.m4
@@ -1,5 +1,5 @@
dnl OJ_CHECK_SIZEOF(TYPE, HEADER [, CROSS-SIZE])
-AC_DEFUN(OJ_CHECK_SIZEOF,
+AC_DEFUN([OJ_CHECK_SIZEOF],
[changequote(<<, >>)dnl
dnl The name to #define.
define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
@@ -31,7 +31,7 @@
dnl
dnl @author Matthias Clasen
dnl
-AC_DEFUN(AC_CXX_PLACEMENT_OPERATOR_DELETE,
+AC_DEFUN([AC_CXX_PLACEMENT_OPERATOR_DELETE],
[AC_CACHE_CHECK(whether the compiler supports placement operator delete,
ac_cv_cxx_placement_operator_delete,
[AC_LANG_SAVE
@@ -61,7 +61,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_TYPENAME,
+AC_DEFUN([AC_CXX_TYPENAME],
[AC_CACHE_CHECK(whether the compiler recognizes typename,
ac_cv_cxx_typename,
[AC_LANG_SAVE
@@ -85,7 +85,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_NEW_FOR_SCOPING,
+AC_DEFUN([AC_CXX_NEW_FOR_SCOPING],
[AC_CACHE_CHECK(whether the compiler accepts the new for scoping rules,
ac_cv_cxx_new_for_scoping,
[AC_LANG_SAVE
@@ -112,7 +112,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_EXPLICIT_INSTANTIATIONS,
+AC_DEFUN([AC_CXX_EXPLICIT_INSTANTIATIONS],
[AC_CACHE_CHECK(whether the compiler supports explicit instantiations,
ac_cv_cxx_explinst,
[AC_LANG_SAVE
@@ -133,7 +133,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_DYNAMIC_CAST,
+AC_DEFUN([AC_CXX_DYNAMIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>,
ac_cv_cxx_dynamic_cast,
[AC_LANG_SAVE
@@ -158,7 +158,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_NAMESPACES,
+AC_DEFUN([AC_CXX_NAMESPACES],
[AC_CACHE_CHECK(whether the compiler implements namespaces,
ac_cv_cxx_namespaces,
[AC_LANG_SAVE
@@ -182,7 +182,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_BOOL,
+AC_DEFUN([AC_CXX_BOOL],
[AC_CACHE_CHECK(whether the compiler recognizes bool as a built-in type,
ac_cv_cxx_bool,
[AC_LANG_SAVE
@@ -200,7 +200,7 @@
fi
])
-AC_DEFUN(AC_DEFINE_DIR, [
+AC_DEFUN([AC_DEFINE_DIR], [
ac_expanded=`(
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
@@ -220,7 +220,7 @@
dnl @version $Id: acinclude.m4,v 1.6 2000/01/13 20:31:46 clasen Exp $
dnl @author Luc Maisonobe
dnl
-AC_DEFUN(AC_CXX_MUTABLE,
+AC_DEFUN([AC_CXX_MUTABLE],
[AC_CACHE_CHECK(whether the compiler supports the mutable keyword,
ac_cv_cxx_mutable,
[AC_LANG_SAVE
@@ -240,0 +241,13 @@
+
+dnl In the intl/Makefile.in we have a special dependency which makes
+dnl sense only for gettext. We comment this out for non-gettext
+dnl packages.
+if test "$PACKAGE" = "gettext"; then
+ GT_NO="#NO#"
+ GT_YES=
+else
+ GT_NO=
+ GT_YES="#YES#"
+fi
+AC_SUBST(GT_NO)
+AC_SUBST(GT_YES)
diff -u openjade-1.4devel1/configure.in openjade-1.4devel1/configure.in
--- openjade-1.4devel1/configure.in
+++ openjade-1.4devel1/configure.in
@@ -11,11 +11,13 @@
dnl
dnl Initialization
-AC_INIT(dsssl)
-AM_INIT_AUTOMAKE(OpenJade, 1.4devel, no-define)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([OpenJade], [1.4devel], [])
+AC_CONFIG_SRCDIR(dsssl)
+AM_INIT_AUTOMAKE([foreign])
+AM_CONFIG_HEADER([config.h])
AM_SANITY_CHECK
AM_MAINTAINER_MODE
+AC_USE_SYSTEM_EXTENSIONS
dnl Use different names than usually to avoid conflicts.
AC_DEFINE_UNQUOTED(OPENJADE_PACKAGE, "$PACKAGE", [Package name])
@@ -36,8 +38,8 @@
dnl Checks for libraries.
AC_CHECK_LIB(pthread,pthread_create,,AC_CHECK_LIB(threads,cthread_fork))
AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION
-AC_CHECK_HEADERS(locale.h)
+AM_GNU_GETTEXT_VERSION([0.19.2])
+AC_CHECK_HEADERS([locale.h])
AC_DEFINE_DIR(OPENJADE_LOCALE_DIR, datadir/locale, [location of message catalogs])
OPENJADE_MESSAGE_DOMAIN=jade
AC_DEFINE_UNQUOTED(OPENJADE_MESSAGE_DOMAIN, "$OPENJADE_MESSAGE_DOMAIN", [message domain])
@@ -46,13 +48,13 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h)
-AC_LANG_CPLUSPLUS
+AC_CHECK_HEADERS([limits.h])
+AC_LANG([C++])
AC_CHECK_HEADERS(new cassert)
dnl Checks for typedefs, structures and compiler characteristics.
AC_TYPE_SIZE_T
-AC_STRUCT_ST_BLKSIZE
+AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CACHE_CHECK(for sig_atomic_t in signal.h,
ac_cv_have_sig_atomic_t,
AC_TRY_LINK([#include <signal.h>],sig_atomic_t x;,
diff -u openjade-1.4devel1/debian/changelog openjade-1.4devel1/debian/changelog
--- openjade-1.4devel1/debian/changelog
+++ openjade-1.4devel1/debian/changelog
@@ -1,3 +1,13 @@
+openjade (1.4devel1-21.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Add acinclude.m4 macro to find correct intlh header whether or
+ not gettext is present (Closes: #748626)
+ * Update rules file to use dh-autoreconf rather than manual commands
+ and update configure.in enough for autoreconf to work
+
+ -- Wookey <[email protected]> Wed, 06 Aug 2014 16:19:34 +0000
+
openjade (1.4devel1-21) unstable; urgency=low
* Added dependency on libperl4-corelibs-perl for getopts.pl. (Closes:
diff -u openjade-1.4devel1/debian/control openjade-1.4devel1/debian/control
--- openjade-1.4devel1/debian/control
+++ openjade-1.4devel1/debian/control
@@ -4,7 +4,7 @@
Maintainer: Neil Roeth <[email protected]>
Homepage: http://openjade.sourceforge.net/
Standards-Version: 3.9.2.0
-Build-Depends: libosp-dev (>= 1.5.1.0-2.1), debhelper (>= 4.1.75), autotools-dev, gettext, dh-buildinfo, libperl4-corelibs-perl
+Build-Depends: libosp-dev (>= 1.5.1.0-2.1), debhelper (>= 4.1.75), dh-autoreconf, gettext, dh-buildinfo, libperl4-corelibs-perl
Package: openjade
Architecture: any
diff -u openjade-1.4devel1/debian/rules openjade-1.4devel1/debian/rules
--- openjade-1.4devel1/debian/rules
+++ openjade-1.4devel1/debian/rules
@@ -77,13 +77,6 @@
mv OpenJade-1.4devel/ChangeLog .
rm -r OpenJade-1.4devel
-autoinit:
- aclocal
- autoheader
- libtoolize --force --copy
- automake --add-missing --force-missing --copy
- autoconf
-
clean:
dh_testdir
rm -f debian/buildinfo
@@ -96,14 +89,11 @@
style/DssslAppMessages.h jade/JadeMessages.h \
jade/RtfMessages.h jade/HtmlMessages.h jade/TeXMessages.h \
jade/MifMessages.h
- # See /usr/share/doc/autotools-dev/README.Debian.gz
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ dh_autoreconf_clean
configure: configure-stamp
configure-stamp:
+ dh_autoreconf
dh_buildinfo generate cat
./configure --prefix=/usr --enable-http --enable-shared --enable-static
touch $@
diff -u openjade-1.4devel1/jade/Makefile.am openjade-1.4devel1/jade/Makefile.am
--- openjade-1.4devel1/jade/Makefile.am
+++ openjade-1.4devel1/jade/Makefile.am
@@ -14,7 +14,7 @@
$(top_builddir)/spgrove/libospgrove.la \
$(top_builddir)/grove/libogrove.la -losp
-INCLUDES = -I$(top_srcdir)/grove -I$(top_srcdir)/spgrove -I$(top_srcdir)/style
+AM_CPPFLAGS = -I$(top_srcdir)/grove -I$(top_srcdir)/spgrove -I$(top_srcdir)/style
EXTRA_DIST = JadeMessages.msg JadeMessages.rc \
HtmlMessages.msg HtmlMessages.rc \
diff -u openjade-1.4devel1/spgrove/Makefile.am openjade-1.4devel1/spgrove/Makefile.am
--- openjade-1.4devel1/spgrove/Makefile.am
+++ openjade-1.4devel1/spgrove/Makefile.am
@@ -9,7 +9,7 @@
pkginclude_HEADERS = GroveApp.h GroveBuilder.h
-INCLUDES = -I$(top_srcdir)/grove
+AM_CPPFLAGS = -I$(top_srcdir)/grove
EXTRA_DIST = grove_inst.m4 grove_inst.cxx spgrove.dsp
diff -u openjade-1.4devel1/style/Makefile.am openjade-1.4devel1/style/Makefile.am
--- openjade-1.4devel1/style/Makefile.am
+++ openjade-1.4devel1/style/Makefile.am
@@ -25,7 +25,7 @@
# the DssslApp class.
pkginclude_HEADERS = FOTBuilder.h dsssl_ns.h DssslApp.h GroveManager.h
-INCLUDES = -I$(top_srcdir)/grove -I$(top_srcdir)/spgrove
+AM_CPPFLAGS = -I$(top_srcdir)/grove -I$(top_srcdir)/spgrove
EXTRA_DIST = FlowObj_inst.cxx primitive_inst.cxx \
style_inst.m4 FlowObj_inst.m4 primitive_inst.m4 \
