Make sure math library is in PKGCONFIG_LIBS_STATIC

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 572382987afb265aaa5d965293d5c1be2eb73f10..fd003a857cdc60da250a28c769195b0ebe7f8da5 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -93,8 +93,11 @@ AC_SUBST([PKGCONFIG_REQUIRES])
 
 dnl Check for libraries...
 AC_SEARCH_LIBS([abs], [m], [AC_DEFINE(HAVE_ABS)])
-AC_SEARCH_LIBS([crypt], [crypt])
 AC_SEARCH_LIBS([fmod], [m])
+
+PKGCONFIG_LIBS_STATIC="$LIBS"
+
+AC_SEARCH_LIBS([crypt], [crypt])
 AC_SEARCH_LIBS([getspent], [sec gen])
 
 LIBMALLOC=""

diff --git a/configure b/configure
index ec5b087d99764e8fd91f64327cc5596f754a879c..0ff19506674f400ca86a99ab85cf632d7204ff1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -5637,9 +5637,9 @@ then :
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-printf %s "checking for library containing crypt... " >&6; }
-if test ${ac_cv_search_crypt+y}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing fmod" >&5
+printf %s "checking for library containing fmod... " >&6; }
+if test ${ac_cv_search_fmod+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
@@ -5650,16 +5650,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-char crypt ();
+char fmod ();
 int
 main (void)
 {
-return crypt ();
+return fmod ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypt
+for ac_lib in '' m
 do
   if test -z "$ac_lib"; then
     ac_res="none required"
@@ -5669,36 +5669,39 @@ do
   fi
   if ac_fn_c_try_link "$LINENO"
 then :
-  ac_cv_search_crypt=$ac_res
+  ac_cv_search_fmod=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if test ${ac_cv_search_crypt+y}
+  if test ${ac_cv_search_fmod+y}
 then :
   break
 fi
 done
-if test ${ac_cv_search_crypt+y}
+if test ${ac_cv_search_fmod+y}
 then :
 
 else $as_nop
-  ac_cv_search_crypt=no
+  ac_cv_search_fmod=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
-printf "%s\n" "$ac_cv_search_crypt" >&6; }
-ac_res=$ac_cv_search_crypt
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmod" >&5
+printf "%s\n" "$ac_cv_search_fmod" >&6; }
+ac_res=$ac_cv_search_fmod
 if test "$ac_res" != no
 then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing fmod" >&5
-printf %s "checking for library containing fmod... " >&6; }
-if test ${ac_cv_search_fmod+y}
+
+PKGCONFIG_LIBS_STATIC="$LIBS"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
+printf %s "checking for library containing crypt... " >&6; }
+if test ${ac_cv_search_crypt+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
@@ -5709,16 +5712,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-char fmod ();
+char crypt ();
 int
 main (void)
 {
-return fmod ();
+return crypt ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' m
+for ac_lib in '' crypt
 do
   if test -z "$ac_lib"; then
     ac_res="none required"
@@ -5728,27 +5731,27 @@ do
   fi
   if ac_fn_c_try_link "$LINENO"
 then :
-  ac_cv_search_fmod=$ac_res
+  ac_cv_search_crypt=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if test ${ac_cv_search_fmod+y}
+  if test ${ac_cv_search_crypt+y}
 then :
   break
 fi
 done
-if test ${ac_cv_search_fmod+y}
+if test ${ac_cv_search_crypt+y}
 then :
 
 else $as_nop
-  ac_cv_search_fmod=no
+  ac_cv_search_crypt=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmod" >&5
-printf "%s\n" "$ac_cv_search_fmod" >&6; }
-ac_res=$ac_cv_search_fmod
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
+printf "%s\n" "$ac_cv_search_crypt" >&6; }
+ac_res=$ac_cv_search_crypt
 if test "$ac_res" != no
 then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"