--- libggi-2.1.0/m4/libtool.m4.libtool	2004-10-29 15:53:22.000000000 -0400

+++ libggi-2.1.0/m4/libtool.m4	2005-08-17 16:15:43.000000000 -0400

@@ -101,6 +101,20 @@ case $host in

   rm -rf conftest*

   ;;

+*-*-linux*)

+  # Test if the compiler is 64bit

+  echo 'int i;' > conftest.$ac_ext

+  lt_cv_cc_64bit_output=no

+  if AC_TRY_EVAL(ac_compile); then

+    case `/usr/bin/file conftest.$ac_objext` in

+    *"ELF 64"*)

+      lt_cv_cc_64bit_output=yes

+      ;;

+    esac

+  fi

+  rm -rf conftest*

+  ;;

+  

 *-*-sco3.2v5*)

   # On SCO OpenServer 5, we need -belf to get full-featured binaries.

   SAVE_CFLAGS="$CFLAGS"

@@ -2222,6 +2236,13 @@ linux-gnu*)

   # before this can be enabled.

   hardcode_into_libs=yes

+  case $host_cpu:$lt_cv_cc_64bit_output in

+  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)

+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"

+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"

+    ;;

+  esac

+

   # We used to test for /lib/ld.so.1 and disable shared libraries on

   # powerpc, because MkLinux only supported shared libraries with the

   # GNU dynamic linker.  Since this was broken with cross compilers,

@@ -2521,7 +2542,7 @@ if test -f "$ltmain"; then

   # careful not to overquote the AC_SUBSTed values.  We take copies of the

   # variables and quote the copies for generation of the libtool script.

   for var in echo old_CC old_CFLAGS SED \

-    AR AR_FLAGS CC LD LN_S NM SHELL STRIP \

+    AR AR_FLAGS CC LD LN_S NM SHELL STRIP EGREP \

     reload_flag reload_cmds wl \

     pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \

     thread_safe_flag_spec whole_archive_flag_spec libname_spec \

@@ -2628,6 +2649,9 @@ CC=$lt_CC

 # Is the compiler the GNU C compiler?

 with_gcc=$GCC

+# An ERE matcher.

+EGREP=$lt_EGREP

+

 # The linker used to build libraries.

 LD=$lt_LD

@@ -3178,7 +3202,8 @@ pic_mode=ifelse($#,1,$1,default)])

 # AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library

 AC_DEFUN([AC_PATH_TOOL_PREFIX],

-[AC_MSG_CHECKING([for $1])

+[AC_REQUIRE([AC_PROG_EGREP])dnl

+AC_MSG_CHECKING([for $1])

 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,

 [case $MAGIC_CMD in

   /*)