summaryrefslogtreecommitdiff
blob: af29d1a5be3c128023fb1f8fc5172ab50e73376f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
--- configure.in
+++ configure.in
@@ -12,7 +12,6 @@
 
 dnl we also need libSigC++ (yeah)
 SIGC_VERSION=1.2.5
-PKG_SIGC="sigc++-1.2"
 
 dnl Set various version strings - taken gratefully from the GTk sources
 
@@ -227,7 +226,7 @@
 
 dnl Check for libSigC++
 
-PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
+PKG_CHECK_MODULES(SIGC, sigc++-1.2 >= $SIGC_VERSION)
 AC_SUBST(SIGC_CFLAGS)
 AC_SUBST(SIGC_LIBS)
 
--- Makefile.am
+++ Makefile.am
@@ -59,8 +59,6 @@
 	mkdir $(distdir)/lib
 	cp $(srcdir)/lib/README.txt $(distdir)/lib
 
-install-hook:
-	-ldconfig
 
 rpm: $(PACKAGE)-$(VERSION).tar.gz
 	cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
--- src/Makefile.am
+++ src/Makefile.am
@@ -11,6 +11,7 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libparagui_la_LIBADD = \
+	$(FREETYPE_LIBS) \
 	$(SIGC_LIBS) \
 	$(SDL_LIBS) \
 	$(EXPAT_LIB) \
--- test/Makefile.am
+++ test/Makefile.am
@@ -28,8 +28,6 @@
 
 LFLAGS=$(SDL_LIBS) -L../src ../src/libparagui.la $(FREETYPE_LIBS)
 
-cairotest_SOURCES = cairotest.cpp
-cairotest_LDADD = $(LFLAGS) -lcairo -lpixman
 
 unicodetest_SOURCES = unicodetest.cpp
 unicodetest_LDADD = $(LFLAGS)