浏览代码

* Use PKG_CHECK_MODULES the right way.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/cacamoo/trunk@1448 92316355-f0b4-4df1-b90c-862c8a59935f
master
sam 18 年前
父节点
当前提交
8d8c3163d2
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. +1
    -1
      configure.ac
  2. +2
    -2
      src/Makefile.am
  3. +1
    -1
      src/main.c

+ 1
- 1
configure.ac 查看文件

@@ -35,7 +35,7 @@ AC_CHECK_FUNCS(getopt_long,
AC_SUBST(GETOPT_LIBS) AC_SUBST(GETOPT_LIBS)


CACA="no" CACA="no"
PKG_CHECK_MODULES(cucul, cucul,
PKG_CHECK_MODULES(CUCUL, cucul,
[CACA="yes"], [CACA="yes"],
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
AC_MSG_ERROR([you need libcucul version 0.99 or later])]) AC_MSG_ERROR([you need libcucul version 0.99 or later])])


+ 2
- 2
src/Makefile.am 查看文件

@@ -2,6 +2,6 @@
bin_PROGRAMS = cacamoo bin_PROGRAMS = cacamoo


cacamoo_SOURCES = main.c cacamoo.h cacamoo_SOURCES = main.c cacamoo.h
cacamoo_CFLAGS = `pkg-config --cflags cucul`
cacamoo_LDFLAGS = `pkg-config --libs cucul`
cacamoo_CFLAGS = @CUCUL_CFLAGS@
cacamoo_LDADD = @CUCUL_LIBS@



+ 1
- 1
src/main.c 查看文件

@@ -264,7 +264,7 @@ int main (int argc, char **argv)
return -1; return -1;
} }
/* Export given canvas to format we want */ /* Export given canvas to format we want */
output_buffer = cucul_export_canvas(canvas, "ansi");
output_buffer = cucul_export_canvas(canvas, "utf8");
if(output_buffer == NULL) if(output_buffer == NULL)
{ {
printf("Can't export file to text !\n"); printf("Can't export file to text !\n");


正在加载...
取消
保存