Commit 63f8b6c5 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed typos introduced in the 2.4 LevMar custom update. 

Added support for 64 bit binary table elements in FITS library (thanks to J.P. McFarland).
parent 534cebef

aclocal.m4

+110 −0
Original line number Diff line number Diff line
@@ -6587,6 +6587,116 @@ AC_SUBST([SED]) 
AC_MSG_RESULT([$SED])

])



# longlong.m4 serial 13

dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.

dnl This file is free software; the Free Software Foundation

dnl gives unlimited permission to copy and/or distribute it,

dnl with or without modifications, as long as this notice is preserved.



dnl From Paul Eggert.



# Define HAVE_LONG_LONG_INT if 'long long int' works.

# This fixes a bug in Autoconf 2.61, but can be removed once we

# assume 2.62 everywhere.



# Note: If the type 'long long int' exists but is only 32 bits large

# (as on some very old compilers), HAVE_LONG_LONG_INT will not be

# defined. In this case you can treat 'long long int' like 'long int'.



AC_DEFUN([AC_TYPE_LONG_LONG_INT],

[

  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],

    [AC_LINK_IFELSE(

       [_AC_TYPE_LONG_LONG_SNIPPET],

       [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.

	dnl If cross compiling, assume the bug isn't important, since

	dnl nobody cross compiles for this platform as far as we know.

	AC_RUN_IFELSE(

	  [AC_LANG_PROGRAM(

	     [[@%:@include <limits.h>

	       @%:@ifndef LLONG_MAX

	       @%:@ define HALF \

			(1LL << (sizeof (long long int) * CHAR_BIT - 2))

	       @%:@ define LLONG_MAX (HALF - 1 + HALF)

	       @%:@endif]],

	     [[long long int n = 1;

	       int i;

	       for (i = 0; ; i++)

		 {

		   long long int m = n << i;

		   if (m >> i != n)

		     return 1;

		   if (LLONG_MAX / 2 < m)

		     break;

		 }

	       return 0;]])],

	  [ac_cv_type_long_long_int=yes],

	  [ac_cv_type_long_long_int=no],

	  [ac_cv_type_long_long_int=yes])],

       [ac_cv_type_long_long_int=no])])

  if test $ac_cv_type_long_long_int = yes; then

    AC_DEFINE([HAVE_LONG_LONG_INT], 1,

      [Define to 1 if the system has the type `long long int'.])

  fi

])



# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.

# This fixes a bug in Autoconf 2.61, but can be removed once we

# assume 2.62 everywhere.



# Note: If the type 'unsigned long long int' exists but is only 32 bits

# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT

# will not be defined. In this case you can treat 'unsigned long long int'

# like 'unsigned long int'.



AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],

[

  AC_CACHE_CHECK([for unsigned long long int],

    [ac_cv_type_unsigned_long_long_int],

    [AC_LINK_IFELSE(

       [_AC_TYPE_LONG_LONG_SNIPPET],

       [ac_cv_type_unsigned_long_long_int=yes],

       [ac_cv_type_unsigned_long_long_int=no])])

  if test $ac_cv_type_unsigned_long_long_int = yes; then

    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,

      [Define to 1 if the system has the type `unsigned long long int'.])

  fi

])



# Expands to a C program that can be used to test for simultaneous support

# of 'long long' and 'unsigned long long'. We don't want to say that

# 'long long' is available if 'unsigned long long' is not, or vice versa,

# because too many programs rely on the symmetry between signed and unsigned

# integer types (excluding 'bool').

AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],

[

  AC_LANG_PROGRAM(

    [[/* Test preprocessor.  */

      #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)

        error in preprocessor;

      #endif

      #if ! (18446744073709551615ULL <= -1ull)

        error in preprocessor;

      #endif

      /* Test literals.  */

      long long int ll = 9223372036854775807ll;

      long long int nll = -9223372036854775807LL;

      unsigned long long int ull = 18446744073709551615ULL;

      /* Test constant expressions.   */

      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)

		     ? 1 : -1)];

      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1

		     ? 1 : -1)];

      int i = 63;]],

    [[/* Test availability of runtime routines for shift and division.  */

      long long int llmax = 9223372036854775807ll;

      unsigned long long int ullmax = 18446744073709551615ull;

      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)

	      | (llmax / ll) | (llmax % ll)

	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)

	      | (ullmax / ull) | (ullmax % ull));]])

])



# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.

#

# This file is free software; the Free Software Foundation

config.h.in

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ 
/* Define to 1 if you have the `logf' function. */

#undef HAVE_LOGF



/* Define to 1 if the system has the type `long long int'. */

#undef HAVE_LONG_LONG_INT



/* Define to 1 if you have the <malloc.h> header file. */

#undef HAVE_MALLOC_H
@@ -153,6 +156,9 @@ 
/* Define to 1 if you have the <unistd.h> header file. */

#undef HAVE_UNISTD_H



/* Define to 1 if the system has the type `unsigned long long int'. */

#undef HAVE_UNSIGNED_LONG_LONG_INT



/* Define to 1 if `lstat' dereferences a symlink specified with a trailing

   slash. */

#undef LSTAT_FOLLOWS_SLASHED_SYMLINK

configure

+254 −10
Original line number Diff line number Diff line 
#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.

# Generated by GNU Autoconf 2.63 for sextractor 2.9.7.

# Generated by GNU Autoconf 2.63 for sextractor 2.9.8.

#

# Report bugs to <bertin@iap.fr>.

#
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.9.7'

PACKAGE_STRING='sextractor 2.9.7'

PACKAGE_VERSION='2.9.8'

PACKAGE_STRING='sextractor 2.9.8'

PACKAGE_BUGREPORT='bertin@iap.fr'









ac_unique_file="src/makeit.c"








@@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then







  # Omit some internal or obsolete options to make the list less imposing.









  # This message is too long to be a string in the A/UX 3.1 sh.









  cat <<_ACEOF









\`configure' configures sextractor 2.9.7 to adapt to many kinds of systems.









\`configure' configures sextractor 2.9.8 to adapt to many kinds of systems.

















Usage: $0 [OPTION]... [VAR=VALUE]...
















@@ -1575,7 +1575,7 @@ fi















if test -n "$ac_init_help"; then









  case $ac_init_help in









     short | recursive ) echo "Configuration of sextractor 2.9.7:";;









     short | recursive ) echo "Configuration of sextractor 2.9.8:";;









   esac









  cat <<\_ACEOF
















@@ -1706,7 +1706,7 @@ fi







test -n "$ac_init_help" && exit $ac_status









if $ac_init_version; then









  cat <<\_ACEOF









sextractor configure 2.9.7









sextractor configure 2.9.8









generated by GNU Autoconf 2.63

















Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,








@@ -1720,7 +1720,7 @@ cat >config.log <<_ACEOF







This file contains any messages produced by compilers while









running configure, to aid debugging if configure makes a mistake.

















It was created by sextractor $as_me 2.9.7, which was









It was created by sextractor $as_me 2.9.8, which was









generated by GNU Autoconf 2.63.  Invocation command line was

















  $ $0 $@








@@ -2423,7 +2423,7 @@ fi















# Define the identity of the package.









 PACKAGE='sextractor'









 VERSION='2.9.7'









 VERSION='2.9.8'

























cat >>confdefs.h <<_ACEOF








@@ -21400,6 +21400,250 @@ else















cat >>confdefs.h <<_ACEOF









#define size_t unsigned int









_ACEOF

















fi

























  { $as_echo "$as_me:$LINENO: checking for long long int" >&5









$as_echo_n "checking for long long int... " >&6; }









if test "${ac_cv_type_long_long_int+set}" = set; then









  $as_echo_n "(cached) " >&6









else









  cat >conftest.$ac_ext <<_ACEOF

















  /* confdefs.h.  */









_ACEOF









cat confdefs.h >>conftest.$ac_ext









cat >>conftest.$ac_ext <<_ACEOF









/* end confdefs.h.  */









/* Test preprocessor.  */









      #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)









        error in preprocessor;









      #endif









      #if ! (18446744073709551615ULL <= -1ull)









        error in preprocessor;









      #endif









      /* Test literals.  */









      long long int ll = 9223372036854775807ll;









      long long int nll = -9223372036854775807LL;









      unsigned long long int ull = 18446744073709551615ULL;









      /* Test constant expressions.   */









      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)









		     ? 1 : -1)];









      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1









		     ? 1 : -1)];









      int i = 63;









int









main ()









{









/* Test availability of runtime routines for shift and division.  */









      long long int llmax = 9223372036854775807ll;









      unsigned long long int ullmax = 18446744073709551615ull;









      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)









	      | (llmax / ll) | (llmax % ll)









	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)









	      | (ullmax / ull) | (ullmax % ull));









  ;









  return 0;









}

















_ACEOF









rm -f conftest.$ac_objext conftest$ac_exeext









if { (ac_try="$ac_link"









case "(($ac_try" in









  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;









  *) ac_try_echo=$ac_try;;









esac









eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""









$as_echo "$ac_try_echo") >&5









  (eval "$ac_link") 2>conftest.er1









  ac_status=$?









  grep -v '^ *+' conftest.er1 >conftest.err









  rm -f conftest.er1









  cat conftest.err >&5









  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5









  (exit $ac_status); } && {









	 test -z "$ac_c_werror_flag" ||









	 test ! -s conftest.err









       } && test -s conftest$ac_exeext && {









	 test "$cross_compiling" = yes ||









	 $as_test_x conftest$ac_exeext









       }; then









  			if test "$cross_compiling" = yes; then









  ac_cv_type_long_long_int=yes









else









  cat >conftest.$ac_ext <<_ACEOF









/* confdefs.h.  */









_ACEOF









cat confdefs.h >>conftest.$ac_ext









cat >>conftest.$ac_ext <<_ACEOF









/* end confdefs.h.  */









#include <limits.h>









	       #ifndef LLONG_MAX









	       # define HALF \









			(1LL << (sizeof (long long int) * CHAR_BIT - 2))









	       # define LLONG_MAX (HALF - 1 + HALF)









	       #endif









int









main ()









{









long long int n = 1;









	       int i;









	       for (i = 0; ; i++)









		 {









		   long long int m = n << i;









		   if (m >> i != n)









		     return 1;









		   if (LLONG_MAX / 2 < m)









		     break;









		 }









	       return 0;









  ;









  return 0;









}









_ACEOF









rm -f conftest$ac_exeext









if { (ac_try="$ac_link"









case "(($ac_try" in









  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;









  *) ac_try_echo=$ac_try;;









esac









eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""









$as_echo "$ac_try_echo") >&5









  (eval "$ac_link") 2>&5









  ac_status=$?









  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5









  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'









  { (case "(($ac_try" in









  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;









  *) ac_try_echo=$ac_try;;









esac









eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""









$as_echo "$ac_try_echo") >&5









  (eval "$ac_try") 2>&5









  ac_status=$?









  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5









  (exit $ac_status); }; }; then









  ac_cv_type_long_long_int=yes









else









  $as_echo "$as_me: program exited with status $ac_status" >&5









$as_echo "$as_me: failed program was:" >&5









sed 's/^/| /' conftest.$ac_ext >&5

















( exit $ac_status )









ac_cv_type_long_long_int=no









fi









rm -rf conftest.dSYM









rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext









fi

























else









  $as_echo "$as_me: failed program was:" >&5









sed 's/^/| /' conftest.$ac_ext >&5

















	ac_cv_type_long_long_int=no









fi

















rm -rf conftest.dSYM









rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \









      conftest$ac_exeext conftest.$ac_ext









fi









{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5









$as_echo "$ac_cv_type_long_long_int" >&6; }









  if test $ac_cv_type_long_long_int = yes; then

















cat >>confdefs.h <<\_ACEOF









#define HAVE_LONG_LONG_INT 1









_ACEOF

















  fi

























  { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5









$as_echo_n "checking for unsigned long long int... " >&6; }









if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then









  $as_echo_n "(cached) " >&6









else









  cat >conftest.$ac_ext <<_ACEOF

















  /* confdefs.h.  */









_ACEOF









cat confdefs.h >>conftest.$ac_ext









cat >>conftest.$ac_ext <<_ACEOF









/* end confdefs.h.  */









/* Test preprocessor.  */









      #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)









        error in preprocessor;









      #endif









      #if ! (18446744073709551615ULL <= -1ull)









        error in preprocessor;









      #endif









      /* Test literals.  */









      long long int ll = 9223372036854775807ll;









      long long int nll = -9223372036854775807LL;









      unsigned long long int ull = 18446744073709551615ULL;









      /* Test constant expressions.   */









      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)









		     ? 1 : -1)];









      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1









		     ? 1 : -1)];









      int i = 63;









int









main ()









{









/* Test availability of runtime routines for shift and division.  */









      long long int llmax = 9223372036854775807ll;









      unsigned long long int ullmax = 18446744073709551615ull;









      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)









	      | (llmax / ll) | (llmax % ll)









	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)









	      | (ullmax / ull) | (ullmax % ull));









  ;









  return 0;









}

















_ACEOF









rm -f conftest.$ac_objext conftest$ac_exeext









if { (ac_try="$ac_link"









case "(($ac_try" in









  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;









  *) ac_try_echo=$ac_try;;









esac









eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""









$as_echo "$ac_try_echo") >&5









  (eval "$ac_link") 2>conftest.er1









  ac_status=$?









  grep -v '^ *+' conftest.er1 >conftest.err









  rm -f conftest.er1









  cat conftest.err >&5









  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5









  (exit $ac_status); } && {









	 test -z "$ac_c_werror_flag" ||









	 test ! -s conftest.err









       } && test -s conftest$ac_exeext && {









	 test "$cross_compiling" = yes ||









	 $as_test_x conftest$ac_exeext









       }; then









  ac_cv_type_unsigned_long_long_int=yes









else









  $as_echo "$as_me: failed program was:" >&5









sed 's/^/| /' conftest.$ac_ext >&5

















	ac_cv_type_unsigned_long_long_int=no









fi

















rm -rf conftest.dSYM









rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \









      conftest$ac_exeext conftest.$ac_ext









fi









{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5









$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }









  if test $ac_cv_type_unsigned_long_long_int = yes; then

















cat >>confdefs.h <<\_ACEOF









#define HAVE_UNSIGNED_LONG_LONG_INT 1









_ACEOF

















  fi








@@ -28291,7 +28535,7 @@ exec 6>&1







# report actual input values of CONFIG_FILES etc. instead of their









# values after options handling.









ac_log="









This file was extended by sextractor $as_me 2.9.7, which was









This file was extended by sextractor $as_me 2.9.8, which was









generated by GNU Autoconf 2.63.  Invocation command line was

















  CONFIG_FILES    = $CONFIG_FILES








@@ -28354,7 +28598,7 @@ Report bugs to <bug-autoconf@gnu.org>."







_ACEOF









cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1









ac_cs_version="\\









sextractor config.status 2.9.7









sextractor config.status 2.9.8









configured by $0, generated by GNU Autoconf 2.63,









  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

































configure.ac



+3
−1






























Original line number
Diff line number
Diff line







@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)







define([AC_CACHE_SAVE],)



















# This is your standard Bertin source code...









AC_INIT(sextractor, 2.9.7, [bertin@iap.fr])









AC_INIT(sextractor, 2.9.8, [bertin@iap.fr])









AC_CONFIG_SRCDIR(src/makeit.c)









AC_CONFIG_AUX_DIR(autoconf)









AM_CONFIG_HEADER(config.h)








@@ -82,6 +82,8 @@ fi







AC_C_CONST









AC_TYPE_OFF_T









AC_TYPE_SIZE_T









AC_TYPE_LONG_LONG_INT









AC_TYPE_UNSIGNED_LONG_LONG_INT









AC_STRUCT_TM









AC_TYPE_UID_T










































man/sex.1



+1
−1






























Original line number
Diff line number
Diff line









.TH SEXTRACTOR "1" "October 2009" "SWarp 2.9.7" "User Commands"









.TH SEXTRACTOR "1" "November 2009" "SWarp 2.9.8" "User Commands"









.SH NAME









sex \- extract a source catalog from an astronomical FITS image









.SH SYNOPSIS