summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2010-01-03 11:58:00 +0200
committerYaniv Kamay <ykamay@redhat.com>2010-01-10 19:45:34 +0200
commite2dd219f6bb96036e54acfd7c2cf65ff09847f9e (patch)
treecbd4515ea0f42745016797ea5d1217a66d7a8b4a /server
parent49e532c327b1ee0d2f83e98812708d58a8496c94 (diff)
downloadspice-e2dd219f6bb96036e54acfd7c2cf65ff09847f9e.tar.gz
spice-e2dd219f6bb96036e54acfd7c2cf65ff09847f9e.tar.xz
spice-e2dd219f6bb96036e54acfd7c2cf65ff09847f9e.zip
configure.ac: use AC_CONFIG_SUBDIRS to run configure in subdirs (subdir config)
That's about all the work configure.ac does. Moved config.pc.in to server, and updated Makefile.am and server/Makefile.am accordingly Signed-off-by: Uri Lublin <uril@redhat.com>
Diffstat (limited to 'server')
-rw-r--r--server/Makefile.am6
-rw-r--r--server/configure.ac3
-rw-r--r--server/spice.pc.in13
3 files changed, 20 insertions, 2 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 63d88e18..15ed08e2 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -82,3 +82,9 @@ EXTRA_DIST = \
glz_encode_match_tmpl.c \
glz_encode_tmpl.c \
$(NULL)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = spice.pc
+
+DISTCLEANFILES = \
+ spice.pc
diff --git a/server/configure.ac b/server/configure.ac
index 254341ec..d047078b 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -32,8 +32,7 @@ AC_SUBST(SPICE_REQUIRES)
AC_SUBST(SPICE_NONPKGCONFIG_CFLAGS)
AC_SUBST(SPICE_NONPKGCONFIG_LIBS)
-AC_CONFIG_FILES([Makefile])
-#AC_CONFIG_FILES([Makefile spice.pc])
+AC_CONFIG_FILES([Makefile spice.pc])
AC_OUTPUT
dnl ==========================================================================
diff --git a/server/spice.pc.in b/server/spice.pc.in
new file mode 100644
index 00000000..5639f4ae
--- /dev/null
+++ b/server/spice.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: spice
+Description: SPICE server library
+Version: @VERSION@
+
+Requires: @SPICE_REQUIRES@
+Libs: -L${libdir} -lspice
+Libs.private: @SPICE_NONPKGCONFIG_LIBS@
+Cflags: -I${includedir}/libspice