diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2017-07-20 22:45:45 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2017-07-20 22:45:45 +0200 |
| commit | f8abdcbe0952ff0e5757730769a253f365719634 (patch) | |
| tree | 5f78d935e96c353dccfa450cec1eba60a3c1f6de /gphoto-m4/gp-check-popt.m4 | |
| parent | a3c9563d9e88b54100eb2e0f4c3b8a4450d0c498 (diff) | |
| download | libgphoto2-f8abdcbe0952ff0e5757730769a253f365719634.tar.gz | |
synchronize gphoto-m4 files
Diffstat (limited to 'gphoto-m4/gp-check-popt.m4')
| -rw-r--r-- | gphoto-m4/gp-check-popt.m4 | 71 |
1 files changed, 66 insertions, 5 deletions
diff --git a/gphoto-m4/gp-check-popt.m4 b/gphoto-m4/gp-check-popt.m4 index 9bf506a24..f88f86958 100644 --- a/gphoto-m4/gp-check-popt.m4 +++ b/gphoto-m4/gp-check-popt.m4 @@ -64,8 +64,34 @@ if test "x$POPT_CFLAGS" = "x" && test "x$POPT_LIBS" = "x"; then # try to find options to compile popt.h CPPFLAGS_save="$CPPFLAGS" popth_found=no - for popt_prefix in "" /usr /usr/local - do + case "$MSYSTEM" in + MINGW32) + if test -n "/mingw32"; then + : + elif test -d "/mingw32/include"; then + CPPFLAGS="-I/mingw32/include ${CPPFLAGS}" + else + continue + fi + ac_cv_header_popt_h="" + unset ac_cv_header_popt_h + AC_CHECK_HEADER([popt.h], [popth_found=yes]) + ;; + MINGW64) + if test -n "${popt_prefix}"; then + : + elif test -d "/mingw64/include"; then + CPPFLAGS="-I/mingw64/include ${CPPFLAGS}" + else + continue + fi + ac_cv_header_popt_h="" + unset ac_cv_header_popt_h + AC_CHECK_HEADER([popt.h], [popth_found=yes]) + ;; + *) + for popt_prefix in "" /usr /usr/local + do if test -n "${popt_prefix}"; then : elif test -d "${popt_prefix}/include"; then @@ -77,7 +103,9 @@ if test "x$POPT_CFLAGS" = "x" && test "x$POPT_LIBS" = "x"; then unset ac_cv_header_popt_h AC_CHECK_HEADER([popt.h], [popth_found=yes]) if test "$popth_found" = yes; then break; fi - done + done + ;; + esac CPPFLAGS="$CPPFLAGS_save" if test "$popth_found" = "yes"; then if test "$popt_prefix" = ""; then @@ -96,7 +124,38 @@ if test "x$POPT_CFLAGS" = "x" && test "x$POPT_LIBS" = "x"; then # try to find options to link against popt LDFLAGS_save="$LDFLAGS" popt_links=no - for popt_prefix in /usr "" /usr/local; do + case "$MSYSTEM" in + MINGW32) +# for ldir in "" lib; do + popt_libdir="/mingw32/lib" + if test "${popt_libdir}" = "/"; then + popt_libdir="" + elif test -d "${popt_libdir}"; then + LDFLAGS="-L${popt_libdir} ${LDFLAGS}" + else + continue + fi + # Avoid caching of results + ac_cv_lib_popt_poptStuffArgs="" + unset ac_cv_lib_popt_poptStuffArgs + AC_CHECK_LIB([popt], [poptStuffArgs], [popt_links=yes]) + ;; + MINGW64) + popt_libdir="/mingw64/lib" + if test "${popt_libdir}" = "/"; then + popt_libdir="" + elif test -d "${popt_libdir}"; then + LDFLAGS="-L${popt_libdir} ${LDFLAGS}" + else + continue + fi + # Avoid caching of results + ac_cv_lib_popt_poptStuffArgs="" + unset ac_cv_lib_popt_poptStuffArgs + AC_CHECK_LIB([popt], [poptStuffArgs], [popt_links=yes]) + ;; + *) + for popt_prefix in /usr "" /usr/local; do # We could have "/usr" and "lib64" at the beginning of the # lists. Then the first tested location would # incidentally be the right one on 64bit systems, and @@ -124,7 +183,9 @@ if test "x$POPT_CFLAGS" = "x" && test "x$POPT_LIBS" = "x"; then if test "$popt_links" = yes; then break; fi done if test "$popt_links" = yes; then break; fi - done + done + ;; + esac LDFLAGS="$LDFLAGS_save" if test "$popt_links" = "yes"; then if test "$popt_libdir" = ""; then |