Commit 23e1525d authored by Stefan Walter's avatar Stefan Walter

Install libcryptui library properly

    * COPYING-LIBCRYPTUI (added):
    * configure.in:
    * libcryptui/Makefile.am: Install libcryptui library properly
parent c0d8fff5
This diff is collapsed.
2006-04-14 Nate Nielsen <nielsen@memberwebs.com>
* COPYING-LIBCRYPTUI (added):
* configure.in:
* libcryptui/Makefile.am: Install libcryptui library properly
2006-04-13 Nate Nielsen <nielsen@memberwebs.com>
* plugins/gedit/Makefile.am:
......
......@@ -2,7 +2,24 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
dnl ****************************************************************************
dnl MAIN SEAHORSE VERSION (update after release)
AC_INIT(seahorse, 0.9.1)
dnl ****************************************************************************
dnl LIBCRYPTUI libtool versioning
dnl CURRENT : REVISION : AGE
dnl +1 : 0 : +1 == new interface that does not break old one.
dnl +1 : 0 : 0 == removed an interface. Breaks old apps.
dnl ? : +1 : ? == internal changes that doesn't break anything.
LIBCRYPTUI_CURRENT=0
LIBCRYPTUI_REVISION=0
LIBCRYPTUI_AGE=0
dnl ****************************************************************************
AC_CONFIG_SRCDIR(src/main.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
......@@ -438,13 +455,6 @@ else
SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $DBUS_CFLAGS"
SEAHORSE_LIBS="$SEAHORSE_LIBS $DBUS_LIBS"
PKG_CHECK_MODULES(LIBCRYPTUI, gtk+-2.0 >= 2.4.0)
LIBCRYPTUI_CFLAGS="$LIBCRYPTUI_CFLAGS $DBUS_CFLAGS"
LIBCRYPTUI_LIBS="$LIBCRYPTUI_LIBS $DBUS_LIBS"
AC_SUBST(LIBCRYPTUI_CFLAGS)
AC_SUBST(LIBCRYPTUI_LIBS)
AS_AC_EXPAND(DATADIR, $datadir)
DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
......@@ -454,8 +464,28 @@ else
fi
AM_CONDITIONAL(WITH_DBUS, test "$enable_dbus" != "no")
dnl ****************************************************************************
dnl LIBCRYPTUI
dnl ****************************************************************************
if test "$enable_dbus" != "yes"; then
echo "disabling libcryptui: no dbus support"
else
LIBCRYPTUI_LT_RELEASE=$LIBCRYPTUI_CURRENT:$LIBCRYPTUI_REVISION:$LIBCRYPTUI_REVISION
AC_SUBST(LIBCRYPTUI_LT_RELEASE)
PKG_CHECK_MODULES(LIBCRYPTUI, gtk+-2.0 >= 2.4.0)
LIBCRYPTUI_CFLAGS="$LIBCRYPTUI_CFLAGS $DBUS_CFLAGS"
LIBCRYPTUI_LIBS="$LIBCRYPTUI_LIBS $DBUS_LIBS"
AC_SUBST(LIBCRYPTUI_CFLAGS)
AC_SUBST(LIBCRYPTUI_LIBS)
fi
dnl ****************************************************************************
dnl GEDIT
dnl ****************************************************************************
......
......@@ -7,26 +7,43 @@ endif
SUBDIRS = . $(TESTS_DIR)
incdir = $(includedir)/libcryptui
inc_HEADERS = \
cryptui.h \
cryptui-keyset.h \
cryptui-key-store.h \
cryptui-key-combo.h \
cryptui-key-list.h \
cryptui-key-chooser.h
INCLUDES = -I$(top_builddir) \
-I$(top_srcdir) \
$(LIBCRYPTUI_CFLAGS)
-I$(top_srcdir) \
$(LIBCRYPTUI_CFLAGS)
lib_LTLIBRARIES = libcryptui.la
BUILT_SOURCES = \
cryptui-marshal.c cryptui-marshal.h
cryptui-marshal.c cryptui-marshal.h
libcryptui_la_SOURCES = \
cryptui.h cryptui.c \
cryptui-keyset.h cryptui-keyset.c \
cryptui-key-store.h cryptui-key-store.c \
cryptui-key-combo.h cryptui-key-combo.c \
cryptui-key-list.h cryptui-key-list.c \
cryptui-key-chooser.h cryptui-key-chooser.c \
$(BUILT_SOURCES)
cryptui.h cryptui.c \
cryptui-keyset.h cryptui-keyset.c \
cryptui-key-store.h cryptui-key-store.c \
cryptui-key-combo.h cryptui-key-combo.c \
cryptui-key-list.h cryptui-key-list.c \
cryptui-key-chooser.h cryptui-key-chooser.c \
$(BUILT_SOURCES)
libcryptui_la_LDFLAGS = \
-version-info $(LIBCRYPTUI_LT_RELEASE)
EXTRA_DIST = \
cryptui-marshal.list
cryptui-marshal.list
CLEANFILES = \
cryptui-marshal.h \
cryptui-marshal.c
cryptui-marshal.h: cryptui-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=cryptui_marshal > $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment