[Groonga-commit] groonga/groonga [master] don't require pkg-config for libedit. #540

Back to archive index

null+****@clear***** null+****@clear*****
2010年 9月 28日 (火) 10:14:06 JST


Kouhei Sutou	2010-09-28 01:14:06 +0000 (Tue, 28 Sep 2010)

  New Revision: f6ae95a23ded523135ed0adc9517fd3d56632be5

  Log:
    don't require pkg-config for libedit. #540

  Modified files:
    configure.ac

  Modified: configure.ac (+10 -7)
===================================================================
--- configure.ac    2010-09-27 08:06:57 +0000 (e103775)
+++ configure.ac    2010-09-28 01:14:06 +0000 (05bebbc)
@@ -484,13 +484,16 @@ AC_ARG_ENABLE(libedit,
   [enable_libedit="$enableval"],
   [enable_libedit="auto"])
 if test "x$enable_libedit" != "xno"; then
-  PKG_CHECK_MODULES([LIBEDIT], [libedit >= 3.0],
-    [LDFLAGS_SAVE="$LDFLAGS"
-     LDFLAGS="$LIBEDIT_LIBS $LDFLAGS"
-     AC_CHECK_LIB(edit, el_wline,
-       [libedit_available=yes],
-       [libedit_available=no])
-     LDFLAGS="$LDFLAGS_SAVE"],
+  m4_ifdef([PKG_CHECK_MODULES], [
+    PKG_CHECK_MODULES([LIBEDIT], [libedit >= 3.0],
+      [LDFLAGS_SAVE="$LDFLAGS"
+       LDFLAGS="$LIBEDIT_LIBS $LDFLAGS"
+       AC_CHECK_LIB(edit, el_wline,
+         [libedit_available=yes],
+         [libedit_available=no])
+       LDFLAGS="$LDFLAGS_SAVE"],
+      [libedit_available=no])
+    ],
     [libedit_available=no])
   if test "x$libedit_available" = "xyes"; then
     AC_DEFINE(HAVE_LIBEDIT, [1], [Use libedit with multibyte support.])




Groonga-commit メーリングリストの案内
Back to archive index