projects / packages / asdcplib.git / blame
| Commit | Line | Data |
|---|---|---|
| c2e6ef43 JB |
1 | --- asdcplib-1.12.60/m4/ax_lib_expat.m4.orig 2009-11-07 01:11:58.000000000 +0100 |
| 2 | +++ asdcplib-1.12.60/m4/ax_lib_expat.m4 2015-04-04 17:34:57.122615887 +0200 | |
| 3 | @@ -101,6 +101,7 @@ | |
| 4 | ||
| 5 | EXPAT_CFLAGS="" | |
| 6 | EXPAT_LDFLAGS="" | |
| 7 | + EXPAT_LIBS="" | |
| 8 | EXPAT_VERSION="" | |
| 9 | ||
| 10 | dnl | |
| 11 | @@ -110,7 +111,6 @@ | |
| 12 | ||
| 13 | if test -n "$expat_prefix"; then | |
| 14 | expat_include_dir="$expat_prefix/include" | |
| 15 | - expat_lib_flags="-L$expat_prefix/lib64 -L$expat_prefix/lib -lexpat" | |
| 16 | run_expat_test="yes" | |
| 17 | elif test "$expat_requested" = "yes"; then | |
| 18 | if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then | |
| 19 | @@ -131,6 +131,9 @@ | |
| 20 | saved_LDFLAGS="$LDFLAGS" | |
| 21 | LDFLAGS="$LDFLAGS $expat_lib_flags" | |
| 22 | ||
| 23 | + saved_LIBS="$LIBS" | |
| 24 | + LIBS="$LIBS -lexpat" | |
| 25 | + | |
| 26 | dnl | |
| 27 | dnl Check Expat headers | |
| 28 | dnl | |
| 29 | @@ -177,6 +180,7 @@ | |
| 30 | )], | |
| 31 | [ | |
| 32 | EXPAT_LDFLAGS="$expat_lib_flags" | |
| 33 | + EXPAT_LIBS="-lexpat" | |
| 34 | expat_lib_found="yes" | |
| 35 | AC_MSG_RESULT([found]) | |
| 36 | ], | |
| 37 | @@ -190,6 +194,7 @@ | |
| 38 | ||
| 39 | CPPFLAGS="$saved_CPPFLAGS" | |
| 40 | LDFLAGS="$saved_LDFLAGS" | |
| 41 | + LIBS="$saved_LIBS" | |
| 42 | fi | |
| 43 | ||
| 44 | AC_MSG_CHECKING([for Expat XML Parser]) | |
| 45 | @@ -199,6 +204,7 @@ | |
| 46 | ||
| 47 | AC_SUBST([EXPAT_CFLAGS]) | |
| 48 | AC_SUBST([EXPAT_LDFLAGS]) | |
| 49 | + AC_SUBST([EXPAT_LIBS]) | |
| 50 | ||
| 51 | HAVE_EXPAT="yes" | |
| 52 | else | |
| 53 | @@ -277,5 +283,6 @@ | |
| 54 | if test "$HAVE_EXPAT" = "yes"; then | |
| 55 | CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS -DHAVE_EXPAT=1" | |
| 56 | LDFLAGS="$LDFLAGS $EXPAT_LDFLAGS" | |
| 57 | + LIBS="$LIBS $EXPAT_LIBS" | |
| 58 | fi | |
| 59 | ]) | |
| 60 | --- asdcplib-1.12.60/m4/ax_lib_openssl.m4.orig 2009-11-07 01:11:58.000000000 +0100 | |
| 61 | +++ asdcplib-1.12.60/m4/ax_lib_openssl.m4 2015-04-04 17:46:23.155934920 +0200 | |
| 62 | @@ -113,7 +113,7 @@ | |
| 63 | ||
| 64 | if test -n "$openssl_prefix"; then | |
| 65 | openssl_include_dir="$openssl_prefix/include" | |
| 66 | - openssl_ldflags="-L$openssl_prefix/lib64 -L$openssl_prefix/lib" | |
| 67 | + openssl_ldflags="" | |
| 68 | run_openssl_test="yes" | |
| 69 | elif test "$openssl_requested" = "yes"; then | |
| 70 | if test -n "$openssl_include_dir" -a -n "$openssl_lib_flags"; then |