diff -r f9a7fa531563 -r 8d3b1ddf789c configure.ac --- a/configure.ac Thu Feb 11 19:47:47 2010 +0000 +++ b/configure.ac Sat Feb 20 12:11:02 2010 +0000 @@ -9,10 +9,14 @@ AC_CONFIG_FILES([Makefile plover/Makefile plover/plover.pc +plover-gtk/Makefile +plover-gtk/plover-gtk.pc setup/Makefile setup/resources.rc update/Makefile update/resources.rc +app-manager/Makefile +app-manager/resources.rc ]) AM_INIT_AUTOMAKE(no-define) case $VERSION in @@ -43,12 +47,19 @@ # increment CURRENT and set AGE and REVISION to 0. # - If the interface is the same as the previous version, increment REVISION. # -LT_CURRENT=0 -LT_REVISION=1 -LT_AGE=0 -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) +lt_current=0 +lt_revision=1 +lt_age=0 +LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" +AC_SUBST(LIBPLOVER_LT_VERSION_INFO) + +# and likewise for plover-gtk. +# +lt_current=0 +lt_revision=0 +lt_age=0 +PLOVER_GTK_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" +AC_SUBST(PLOVER_GTK_LT_VERSION_INFO) ################################################## # Checks for programs. @@ -75,10 +86,21 @@ PKG_CHECK_MODULES(RAZOR,[razor >= 0.2],[:],[RAZOR_LIBS=-lrazor]) PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat]) PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz]) +PKG_CHECK_MODULES(GIO,[gio-2.0]) +PKG_CHECK_MODULES(GTK,[gtk+-2.0]) +PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0]) LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS" LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS" AC_SUBST(LIBPLOVER_CFLAGS) AC_SUBST(LIBPLOVER_LIBS) +PLOVER_GTK_CFLAGS="$GTK_CFLAGS $RAZOR_CFLAGS" +PLOVER_GTK_LIBS="$GTK_LIBS $RAZOR_LIBS" +AC_SUBST(PLOVER_GTK_CFLAGS) +AC_SUBST(PLOVER_GTK_LIBS) +GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $GIO_CFLAGS $PLOVER_GTK_CFLAGS $LIBPLOVER_CFLAGS" +GUI_LIBS="$GMODULE_EXPORT_LIBS $GIO_LIBS $PLOVER_GTK_LIBS $LIBPLOVER_LIBS" +AC_SUBST(GUI_CFLAGS) +AC_SUBST(GUI_LIBS) save_PKG_CONFIG="$PKG_CONFIG" PKG_CONFIG="$PKG_CONFIG --static" PKG_CHECK_MODULES(SETUP,[whelk])