1.1 --- a/configure.ac	Thu Feb 11 19:47:47 2010 +0000
     1.2 +++ b/configure.ac	Sat Feb 20 12:11:02 2010 +0000
     1.3 @@ -9,10 +9,14 @@
     1.4  AC_CONFIG_FILES([Makefile
     1.5  plover/Makefile
     1.6  plover/plover.pc
     1.7 +plover-gtk/Makefile
     1.8 +plover-gtk/plover-gtk.pc
     1.9  setup/Makefile
    1.10  setup/resources.rc
    1.11  update/Makefile
    1.12  update/resources.rc
    1.13 +app-manager/Makefile
    1.14 +app-manager/resources.rc
    1.15  ])
    1.16  AM_INIT_AUTOMAKE(no-define)
    1.17  case $VERSION in
    1.18 @@ -43,12 +47,19 @@
    1.19  #   increment CURRENT and set AGE and REVISION to 0.
    1.20  # - If the interface is the same as the previous version, increment REVISION.
    1.21  #
    1.22 -LT_CURRENT=0
    1.23 -LT_REVISION=1
    1.24 -LT_AGE=0
    1.25 -AC_SUBST(LT_CURRENT)
    1.26 -AC_SUBST(LT_REVISION)
    1.27 -AC_SUBST(LT_AGE)
    1.28 +lt_current=0
    1.29 +lt_revision=1
    1.30 +lt_age=0
    1.31 +LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
    1.32 +AC_SUBST(LIBPLOVER_LT_VERSION_INFO)
    1.33 +
    1.34 +# and likewise for plover-gtk.
    1.35 +#
    1.36 +lt_current=0
    1.37 +lt_revision=0
    1.38 +lt_age=0
    1.39 +PLOVER_GTK_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
    1.40 +AC_SUBST(PLOVER_GTK_LT_VERSION_INFO)
    1.41  
    1.42  ##################################################
    1.43  # Checks for programs.
    1.44 @@ -75,10 +86,21 @@
    1.45  PKG_CHECK_MODULES(RAZOR,[razor >= 0.2],[:],[RAZOR_LIBS=-lrazor])
    1.46  PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
    1.47  PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
    1.48 +PKG_CHECK_MODULES(GIO,[gio-2.0])
    1.49 +PKG_CHECK_MODULES(GTK,[gtk+-2.0])
    1.50 +PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0])
    1.51  LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS"
    1.52  LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS"
    1.53  AC_SUBST(LIBPLOVER_CFLAGS)
    1.54  AC_SUBST(LIBPLOVER_LIBS)
    1.55 +PLOVER_GTK_CFLAGS="$GTK_CFLAGS $RAZOR_CFLAGS"
    1.56 +PLOVER_GTK_LIBS="$GTK_LIBS $RAZOR_LIBS"
    1.57 +AC_SUBST(PLOVER_GTK_CFLAGS)
    1.58 +AC_SUBST(PLOVER_GTK_LIBS)
    1.59 +GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $GIO_CFLAGS $PLOVER_GTK_CFLAGS $LIBPLOVER_CFLAGS"
    1.60 +GUI_LIBS="$GMODULE_EXPORT_LIBS $GIO_LIBS $PLOVER_GTK_LIBS $LIBPLOVER_LIBS"
    1.61 +AC_SUBST(GUI_CFLAGS)
    1.62 +AC_SUBST(GUI_LIBS)
    1.63  save_PKG_CONFIG="$PKG_CONFIG"
    1.64  PKG_CONFIG="$PKG_CONFIG --static"
    1.65  PKG_CHECK_MODULES(SETUP,[whelk])