diff options
Diffstat (limited to 'kipi-plugins/configure.in.in')
| -rw-r--r-- | kipi-plugins/configure.in.in | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/kipi-plugins/configure.in.in b/kipi-plugins/configure.in.in index 7963aee..809f2e1 100644 --- a/kipi-plugins/configure.in.in +++ b/kipi-plugins/configure.in.in @@ -308,19 +308,30 @@ fi have_gphoto=no if test "x$build_gphoto" != "xno"; then - AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config) - AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config) - if test -n "${GPHOTO_CONFIG}"; then - GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`" - AC_SUBST(GPHOTO_CFLAGS) - LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`" - AC_SUBST(LIB_GPHOTO) - have_gphoto=yes + + KDE_PKG_CHECK_MODULES(GPHOTO, libgphoto2, + have_gphoto=yes, have_gphoto=no) + + if test "x$have_gphoto" != "xyes"; then + AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config) + AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config) + if test -n "${GPHOTO_CONFIG}"; then + GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`" + AC_SUBST(GPHOTO_CFLAGS) + GPHOTO_LIBS="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`" + AC_SUBST(GPHOTO_LIBS) + have_gphoto=yes + fi + fi + + if test "x$have_gphoto" = "xyes"; then AC_CHECK_LIB(gphoto2_port, gp_port_info_get_name, have_gphoto2_5=yes, have_gphoto2_5=no) if test "x$have_gphoto2_5" != "xno"; then AC_DEFINE(HAVE_GPHOTO2_5, 1, [have gphoto 2.5]) fi - else + fi + + if test "x$have_gphoto" != "xyes"; then AC_MSG_WARN([gPhoto2 not found, some plugins will not be compiled.]) fi fi |