fix maintainer mode issue, extra line in paste

AcademySoftwareFoundation · Aug 8, 2018 · 772ff9a · 772ff9a
1 parent dc5e261
commit 772ff9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/OpenEXR/configure.ac b/OpenEXR/configure.ac
@@ -13,7 +13,8 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
 AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+AM_MAINTAINER_MODE
 
 
 LIBTOOL_CURRENT=22
@@ -27,7 +28,7 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_LN_S
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
 dnl
@@ -37,8 +38,8 @@ PKG_CHECK_MODULES([ILMBASE], [IlmBase])
 
 
 dnl Define the version string
-AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], [${VERSION}], [OpenEXR version string])
-AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], [${PACKAGE_STRING}], [OpenEXR version string])
+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
 AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
 AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
 AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
@@ -62,7 +63,6 @@ else
       CXXFLAGS="$CXXFLAGS -std=c++11"
     else
       if test "${cxxstd}" == 03 ; then
-        AC_DEFINE(ILMBASE_FORCE_CXX03)
         CXXFLAGS="$CXXFLAGS -std=c++03"
       else
         dnl automatically determine...

diff --git a/OpenEXR_Viewers/configure.ac b/OpenEXR_Viewers/configure.ac
@@ -97,7 +97,6 @@ else
       CXXFLAGS="$CXXFLAGS -std=c++11"
     else
       if test "${cxxstd}" == 03 ; then
-        AC_DEFINE(ILMBASE_FORCE_CXX03)
         CXXFLAGS="$CXXFLAGS -std=c++03"
       else
         dnl automatically determine...

diff --git a/PyIlmBase/configure.ac b/PyIlmBase/configure.ac
@@ -52,7 +52,6 @@ else
       CXXFLAGS="$CXXFLAGS -std=c++11"
     else
       if test "${cxxstd}" == 03 ; then
-        AC_DEFINE(ILMBASE_FORCE_CXX03)
         CXXFLAGS="$CXXFLAGS -std=c++03"
       else
         dnl automatically determine...