Updated to latest pandora-build. Removed the .ver scripts to be consistent with other...

[awesomized/libmemcached] / m4 / pandora_canonical.m4

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index ef5e1983df69d9f05cf9874ad840f4072801a623..0542e3d3ce6b43d6ed0e0250d5771524f54161c2 100644 (file)
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using

-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.80])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.86])

 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds


@@ -97,13 +97,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
 
   PANDORA_LIBTOOL
 
 
   PANDORA_LIBTOOL
 

-  AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
-    ${LD} --help | grep default-symver >/dev/null 2>&1
-    AS_IF([test $? -eq 0],[
-      AM_LDFLAGS="${AM_LDFLAGS} -Wl,--default-symver"
-    ])
-  ])
-

   dnl autoconf doesn't automatically provide a fail-if-no-C++ macro
   dnl so we check c++98 features and fail if we don't have them, mainly
   dnl for that reason
   dnl autoconf doesn't automatically provide a fail-if-no-C++ macro
   dnl so we check c++98 features and fail if we don't have them, mainly
   dnl for that reason


@@ -176,12 +169,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   dnl alloca - but we need to know it anyway for check_stack_overrun.
   PANDORA_STACK_DIRECTION
 
   dnl alloca - but we need to know it anyway for check_stack_overrun.
   PANDORA_STACK_DIRECTION
 

-  save_LIBS="${LIBS}"
-  LIBS=""
-  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
-  LIBM="${LIBS}"
-  LIBS="${save_LIBS}"
-  AC_SUBST([LIBM])
+  AC_CHECK_LIBM

   
   AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
   AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])
   
   AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
   AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])


@@ -244,6 +232,5 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   AC_SUBST([AM_CFLAGS])
   AC_SUBST([AM_CXXFLAGS])
   AC_SUBST([AM_CPPFLAGS])
   AC_SUBST([AM_CFLAGS])
   AC_SUBST([AM_CXXFLAGS])
   AC_SUBST([AM_CPPFLAGS])

-  AC_SUBST([AM_LDFLAGS])

 
 ])
 
 ])