Compile against newer PoDoFo packages with C++11

Newer PoDoFo packages require and are built with C++11 standard
We thus do the same for faxcover so we can compile against these
newer packages. We also make sure to only link faxcover against
the PoDoFo library.

diff --git a/configure b/configure
index a56546e651d69c4e8fe77871b97ee790969408d7..50a613d78fda98fdb9670755ed2c7c9d48df18f7 100755 (executable)
--- a/configure
+++ b/configure
@@ -231,6 +231,7 @@ PCL6CMD
 PKG_ARCH
 PKG_EMAIL
 PKG_VENDOR
+PODOFOINC
 PORTFUNCS
 PROTOTYPES
 PSPACKAGE      PS

diff --git a/defs.in b/defs.in
index 6040f49a4b2ca68d1054a4bca91bb5d7efc6a569..1eb481e7bd810f8ffc28c7bfda270876a85b66dc 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -202,6 +202,10 @@ LIBPAM             = @LIBPAM@
 LIBUTIL                = @LIBUTIL@
 LIBCRYPT       = @LIBCRYPT@
 
+#PoDoFo libraries
+LIBPODOFO      = @LIBPODOFO@
+PODOFOINC      = @PODOFOINC@
+
 #
 # Definitions used by common rules.
 #

diff --git a/faxcover/Makefile.in b/faxcover/Makefile.in
index a6a3b2f4b6b0011e754b419ca836f4418536c43a..898f12850b661750ea170350fd25e9eca29323cc 100644 (file)
--- a/faxcover/Makefile.in
+++ b/faxcover/Makefile.in
@@ -40,6 +40,9 @@ DEPTH=..
 SUBDIR=faxcover
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
+LC++INCS = ${PODOFOINC}
+VLDLIBS = ${LIBPODOFO}
+
 C++FILES= faxcover.c++
 TARGETS        = faxcover
 

diff --git a/rpm/hylafax.spec b/rpm/hylafax.spec
index 594035329be8b33baa3fccf748131667b8d399f2..5f12e2d9b78c3227cb965f479017e02061baea6d 100644 (file)
--- a/rpm/hylafax.spec
+++ b/rpm/hylafax.spec
@@ -152,6 +152,9 @@ export CXX=$(which g++)
        --with-PATH_DPSRIP=%{faxspool}/bin/ps2fax \
        --with-PATH_IMPRIP="" \
        --with-SYSVINIT=%{initdir}/hylafax \
+%if 0%{rhel} == 7
+       --with-PODOFOINC="-std=c++11" \
+%endif
        --with-INTERACTIVE=no
 
 # CFLAGS is set up by the HylaFAX configure script; setting it up here the