|
From: Kouhei S. <nul...@cl...> - 2013-05-27 01:52:49
|
Kouhei Sutou 2013-05-27 10:52:19 +0900 (Mon, 27 May 2013) New Revision: 8d3dc5c6f8c13f386d1ec7aa0e6157464af7bfa4 https://github.com/clear-code/cutter/commit/8d3dc5c6f8c13f386d1ec7aa0e6157464af7bfa4 Message: Don't require PKG_CHECK_MODULES Modified files: m4macros/cutter.m4 Modified: m4macros/cutter.m4 (+15 -0) =================================================================== --- m4macros/cutter.m4 2013-05-18 00:41:38 +0900 (0b95808) +++ m4macros/cutter.m4 2013-05-27 10:52:19 +0900 (79da330) @@ -113,9 +113,12 @@ AC_DEFUN([AC_CHECK_CUTTER], if test "x$cutter_with_value" = "xno"; then cutter_use_cutter=no else + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(CUTTER, cutter $1, [cutter_use_cutter=yes], [cutter_use_cutter=no]) + ], + [cutter_use_cutter=no]) fi fi if test "$cutter_use_cutter" != "no"; then @@ -135,9 +138,12 @@ AC_DEFUN([AC_CHECK_GCUTTER], cutter_use_gcutter=no fi if test "x$cutter_use_gcutter" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(GCUTTER, gcutter $1, [cutter_use_gcutter=yes], [cutter_use_gcutter=no]) + ], + [cutter_use_gcutter=no]) fi ac_cv_use_gcutter="$cutter_use_gcutter" # for backward compatibility AC_SUBST([GCUTTER_CFLAGS]) @@ -151,9 +157,12 @@ AC_DEFUN([AC_CHECK_CPPCUTTER], cutter_use_cppcutter=no fi if test "x$cutter_use_cppcutter" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(CPPCUTTER, cppcutter $1, [cutter_use_cppcutter=yes], [cutter_use_cppcutter=no]) + ], + [cutter_use_cppcutter=no]) fi ac_cv_use_cppcutter="$cutter_use_cppcutter" # for backward compatibility AC_SUBST([CPPCUTTER_CFLAGS]) @@ -167,9 +176,12 @@ AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF], cutter_use_gdkcutter_pixbuf=no fi if test "x$cutter_use_gdkcutter_pixbuf" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, [cutter_use_gdkcutter_pixbuf=yes], [cutter_use_gdkcutter_pixbuf=no]) + ], + [cutter_use_gdkcutter_pixbuf=no]) fi ac_cv_use_gdkcutter_pixbuf="$cutter_use_gdkcutter_pixbuf" # for backward compatibility AC_SUBST([GDKCUTTER_PIXBUF_CFLAGS]) @@ -183,9 +195,12 @@ AC_DEFUN([AC_CHECK_SOUPCUTTER], cutter_use_soupcutter=no fi if test "$cutter_use_soupcutter" != "no"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, [cutter_use_soupcutter=yes], [cutter_use_soupcutter=no]) + ], + [cutter_use_soupcutter=no]) fi ac_cv_use_soupcutter="$cutter_use_soupcutter" # for backward compatibility AC_SUBST([SOUPCUTTER_CFLAGS]) |