From 921a50766538847b18ed2bbbb92732f4fe6aa7fb Mon Sep 17 00:00:00 2001
From: Tiago de Paula Peixoto <tiago@skewed.de>
Date: Thu, 5 Jul 2007 23:19:54 +0000
Subject: [PATCH] * add option to disable hidden visibility for 64-bit systems

git-svn-id: https://svn.forked.de/graph-tool/trunk@107 d4600afd-f417-0410-95de-beed9576f240
---
 configure.in | 15 +++++++++++++--
 ltmain.sh    | 23 +++++++++++++----------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/configure.in b/configure.in
index 4c9bde30..246ca3f7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(graph-tool, 1.1.3bump)
+AC_INIT(graph-tool, 1.1.2)
 AC_CONFIG_SRCDIR(src/graph-tool)
 AM_INIT_AUTOMAKE
 AM_PROG_CC_C_O
@@ -32,7 +32,7 @@ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug@<:@=full@:>@],
 
 dnl set template depth and hidden visibility
 
-[CXXFLAGS="$CXXFLAGS -ftemplate-depth-150 -fvisibility=hidden -fvisibility-inlines-hidden "]
+[CXXFLAGS="$CXXFLAGS -ftemplate-depth-150 "]
 
 AC_MSG_CHECKING(whether to enable function inlining...)
                                                                                 
@@ -63,6 +63,17 @@ AC_ARG_ENABLE([optimization], [AC_HELP_STRING([--disable-optimization],
         [CXXFLAGS=" $CXXFLAGS -O99 "]
         )
 
+AC_MSG_CHECKING(whether to enable hidden visibility...)
+                                                                                
+AC_ARG_ENABLE([visibility], [AC_HELP_STRING([--disable-visibility],
+        [disable hidden visibility [default=yes] ])],
+        [AC_MSG_RESULT(no)]
+        ,
+        [AC_MSG_RESULT(yes)]
+        [CXXFLAGS=" $CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden "]
+        )
+
+
 AC_MSG_CHECKING(whether to enable graph python filtering...)
 AC_ARG_ENABLE([python-filtering], [AC_HELP_STRING([--enable-python-filtering],
         [enable python graph filtering [default=no] ])],
diff --git a/ltmain.sh b/ltmain.sh
index 1e7283d5..d74b5a67 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.23b
-TIMESTAMP=" (1.1220.2.437 2007/02/17 09:08:45)"
+VERSION=1.5.24
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -1705,9 +1705,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -3253,9 +3253,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3314,7 +3315,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3328,8 +3330,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -6544,8 +6549,6 @@ relink_command=\"$relink_command\""
       do
 	eval "if test \"\${save_$lt_var+set}\" = set; then
 		$lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
 	      fi"
       done
 
-- 
GitLab