Permalink
Browse files

Fixed configuration of levmar to include -lm

  • Loading branch information...
1 parent fd4a87b commit 6bc694d123b788c67f01b58040597d34654b9904 @laurentbartholdi committed Oct 17, 2012
Showing with 79 additions and 66 deletions.
  1. +2 −0 .gitignore
  2. +5 −1 cnf/aclocal.m4
  3. +4 −4 cnf/m4/ac_check_levmar.m4
  4. +4 −4 configure
  5. +5 −1 hurwitz/aclocal.m4
  6. +4 −4 hurwitz/configure
  7. +55 −52 libtool
View
@@ -1,4 +1,6 @@
Makefile
+Makefile-*
+confdefs.h
config.log
www
sandbox
View
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -19,6 +19,8 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 10
+
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
@@ -50,6 +52,8 @@ fi])])
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 3
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -26,15 +26,15 @@ LEVMAR_LIBS="-llevmar -llapack -lblas"
AC_LANG_PUSH([C])
-lm_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $LEVMAR_CFLAGS"
+lm_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $LEVMAR_CFLAGS"
AC_CHECK_HEADER(levmar.h,,AC_MSG_ERROR([levmar.h not found. Specify its location using --with-levmar.
The package may be downloaded from http://www.ics.forth.gr/~lourakis/levmar/]))
-CFLAGS=$lm_CFLAGS
+CPPFLAGS=$lm_CPPFLAGS
lm_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $LEVMAR_LDFLAGS"
-AC_CHECK_LIB(levmar,dlevmar_dif,,AC_MSG_ERROR([liblevmar not found. Specify its location using --with-levmar.]),[-llapack -lblas])
+AC_CHECK_LIB(levmar,dlevmar_dif,,AC_MSG_ERROR([liblevmar not found. Specify its location using --with-levmar.]),[-llapack -lblas -lm])
LDFLAGS=$lm_LDFLAGS
AC_LANG_POP([C])
View
@@ -12870,8 +12870,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-lm_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $LEVMAR_CFLAGS"
+lm_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $LEVMAR_CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "levmar.h" "ac_cv_header_levmar_h" "$ac_includes_default"
if test "x$ac_cv_header_levmar_h" = xyes; then :
@@ -12881,7 +12881,7 @@ The package may be downloaded from http://www.ics.forth.gr/~lourakis/levmar/" "$
fi
-CFLAGS=$lm_CFLAGS
+CPPFLAGS=$lm_CPPFLAGS
lm_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $LEVMAR_LDFLAGS"
@@ -12891,7 +12891,7 @@ if ${ac_cv_lib_levmar_dlevmar_dif+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llevmar -llapack -lblas $LIBS"
+LIBS="-llevmar -llapack -lblas -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
View
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -19,6 +19,8 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 10
+
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
@@ -50,6 +52,8 @@ fi])])
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 3
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
View
@@ -4161,8 +4161,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-lm_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $LEVMAR_CFLAGS"
+lm_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $LEVMAR_CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "levmar.h" "ac_cv_header_levmar_h" "$ac_includes_default"
if test "x$ac_cv_header_levmar_h" = xyes; then :
@@ -4172,7 +4172,7 @@ The package may be downloaded from http://www.ics.forth.gr/~lourakis/levmar/" "$
fi
-CFLAGS=$lm_CFLAGS
+CPPFLAGS=$lm_CPPFLAGS
lm_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $LEVMAR_LDFLAGS"
@@ -4182,7 +4182,7 @@ if ${ac_cv_lib_levmar_dlevmar_dif+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llevmar -llapack -lblas $LIBS"
+LIBS="-llevmar -llapack -lblas -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Oops, something went wrong.

0 comments on commit 6bc694d

Please sign in to comment.