Gargh.

m4/check-package.m4

@@ -177,8 +177,8 @@ dnl now check if the library and header files exist
 dnl
 if test "$8" = "optional" ; then
   AC_CHECK_LIB(${UPNAME[_NAME]}, main,
-    [UPNAME[_LIB]="-L${UPNAME[_LIB_PATH]} -l$2"
-     UPNAME[_ALL_LIB]="-L${UPNAME[_LIB_PATH]} -l$2 $4"],
+    [UPNAME[_LIB]="-L${UPNAME[_LIB_PATH]} -l${UPNAME[_NAME]}"
+     UPNAME[_ALL_LIB]="-L${UPNAME[_LIB_PATH]} -l${UPNAME[_NAME]} $4"],
     [UPNAME[_LIB]=""
      UPNAME[_ALL_LIB]=""
      UPNAME[_LIB_PATH]=""
@@ -187,9 +187,9 @@ if test "$8" = "optional" ; then
     -L${UPNAME[_LIB_PATH]} $4)
 else
   AC_CHECK_LIB(${UPNAME[_NAME]}, main,
-    [UPNAME[_LIB]="-L${UPNAME[_LIB_PATH]} -l$2"
-     UPNAME[_ALL_LIB]="-L${UPNAME[_LIB_PATH]} -l$2 $4"],
-    [AC_MSG_ERROR([Library "lib$2" was not found])],
+    [UPNAME[_LIB]="-L${UPNAME[_LIB_PATH]} -l${UPNAME[_NAME]}"
+     UPNAME[_ALL_LIB]="-L${UPNAME[_LIB_PATH]} -l${UPNAME[_NAME]} $4"],
+    [AC_MSG_ERROR([Library "lib${UPNAME[_NAME]}" was not found])],
     -L$UPNAME[_LIB_PATH] $4)
 fi
 if test "x${UPNAME[_LIB]}" = "x" ; then