[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=e3e6d37

The following commit has been merged in the master branch:
commit e3e6d37d07713e5b3e8e0cfe1655293a85121c67
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Dec 2 13:32:20 2008 +0000

    #583: Added configure option to disable g++ visibility support.
---
 config/configure.ac | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 12f813a..9906d48 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -89,8 +89,7 @@ AC_SUBST(HAVE_TIMEGM,$HAVE_TIMEGM)
 # ---------------------------------------------------------------------------
 AC_MSG_CHECKING([whether to enable dependency tracking])
 AC_ARG_ENABLE(dependency-tracking,
-    [  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors],
+    [  --disable-dependency-tracking  speeds up one-time build],
     USE_TRACKING=$enableval, USE_TRACKING=yes)
 AC_MSG_RESULT($USE_TRACKING)
 DEP_TRACKING=
@@ -99,6 +98,22 @@ if test "$USE_TRACKING" = "yes"; then
 fi
 AC_SUBST(DEP_TRACKING,$DEP_TRACKING)
 
+AC_MSG_CHECKING([whether to enable g++ visibility support])
+AC_ARG_ENABLE(visibility,
+    [  --disable-visibility    do not use g++ visibility support ],
+    GXX_VISIBILITY=$enableval, GXX_VISIBILITY=yes)
+AC_MSG_RESULT($GXX_VISIBILITY)
+if test "$GXX_VISIBILITY" = "yes"; then
+    AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
+    if test "$GXX_VISIBILITY" = "yes"; then
+        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        AC_DEFINE(HAVE_GXXCLASSVISIBILITY,1)
+    fi
+    if test "$enable_shared" = "yes"; then
+        AC_DEFINE(HAVE_DLL)
+    fi
+fi
+
 AC_MSG_CHECKING([whether to use the lens database for Exif.Nikon3.LensData])
 AC_ARG_ENABLE(lensdata,
     [  --disable-lensdata      do not use the lens database for Exif.Nikon3.LensData ],
@@ -189,16 +204,6 @@ else
 fi
 AC_SUBST(EXV_LIB_STATIC)
 
-# g++ visibility support
-AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
-if test "$GXX_VISIBILITY" = "yes"; then
-    CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
-    AC_DEFINE(HAVE_GXXCLASSVISIBILITY,1)
-fi
-if test "$enable_shared" = "yes"; then
-    AC_DEFINE(HAVE_DLL)
-fi
-
 # ---------------------------------------------------------------------------
 # Create output files.
 # ---------------------------------------------------------------------------
@@ -223,6 +228,11 @@ yes) echo "-- Build a shared library......... YES" ;;
 *)   echo "-- Build a shared library......... NO" ;;
 esac
 
+case "$GXX_VISIBILITY" in
+yes) echo "-- Use g++ visibility support..... YES" ;;
+*)   echo "-- Use g++ visibility support..... NO" ;;
+esac
+
 case "x$HAVE_LIBZ" in
 x1)  echo "-- PNG image support.............. YES" ;;
 *)   echo "-- PNG image support.............. NO"

-- 
exiv2 packaging