--- configure.in.orig 2007-07-20 09:30:28.000000000 +0200
+++ configure.in 2007-07-20 09:32:05.000000000 +0200
@@ -15,8 +15,19 @@
dnl AM_PATH_RRA forgets to add mimedir to the list of dependicies.
dnl Fix it here.
LIBS="-lmimedir $LIBS"
-AM_PATH_RRA
-AM_PATH_LIBSYNCE
+dnl AM_PATH_RRA
+dnl AM_PATH_LIBSYNCE
+PKG_CHECK_MODULES(LIBRRA, [librra])
+AC_SUBST(LIBRRA_CFLAGS)
+AC_SUBST(LIBRRA_LIBS)
+
+PKG_CHECK_MODULES(LIBSYNCE, [libsynce])
+AC_SUBST(LIBSYNCE_CFLAGS)
+AC_SUBST(LIBSYNCE_LIBS)
+
+PKG_CHECK_MODULES(LIBRAPI2, [librapi2])
+AC_SUBST(LIBRAPI2_CFLAGS)
+AC_SUBST(LIBRAPI2_LIBS)
AC_ISC_POSIX
AC_PROG_CC
--- src/Makefile.am.orig 2007-07-20 09:32:53.000000000 +0200
+++ src/Makefile.am 2007-07-20 09:26:30.000000000 +0200
@@ -2,7 +2,8 @@
configdir=@OPENSYNC_CONFIGDIR@
formatsdir=@OPENSYNC_FORMATSDIR@
-AM_CFLAGS = -Wall -Werror @PACKAGE_CFLAGS@
+AM_CFLAGS = -Wall -Werror @PACKAGE_CFLAGS@ $(LIBSYNCE_CFLAGS) \
+$(LIBRRA_CFLAGS) $(LIBRAPI2_CFLAGS)
EXTRA_DIST = synce-plugin
@@ -18,10 +19,13 @@
synce_file.h
synce_plugin_la_LDFLAGS = -avoid-version -export-dynamic -module
-synce_plugin_la_LIBADD = @PACKAGE_LIBS@ @LIBS@ -lrapi -lsynce -lrra
+synce_plugin_la_LIBADD = @PACKAGE_LIBS@ @LIBS@ $(LIBSYNCE_LIBS) $(LIBRRA_LIBS) $(LIBRAPI2_LIBS)
+synce_plugin_la_CFLAGS = @PACKAGE_CFLAGS@ $(LIBSYNCE_CFLAGS) \
+$(LIBRRA_CFLAGS) $(LIBRAPI2_CFLAGS)
noinst_PROGRAMS = ft
ft_SOURCES= synce_file.c synce_file.h
-ft_CFLAGS = -DTEST_FILE -Wall -Werror @PACKAGE_CFLAGS@
-ft_LDADD = @PACKAGE_LIBS@ @LIBS@ -lrapi -lsynce -lrra
+ft_CFLAGS = -DTEST_FILE -Wall -Werror @PACKAGE_CFLAGS@ $(LIBSYNCE_CFLAGS) \
+$(LIBRRA_CFLAGS) $(LIBRAPI2_CFLAGS)
+ft_LDADD = @PACKAGE_LIBS@ @LIBS@ $(LIBSYNCE_LIBS) $(LIBRRA_LIBS) $(LIBRAPI2_LIBS)