diff options
Diffstat (limited to 'libical/src/test')
| -rw-r--r-- | libical/src/test/Makefile.am | 10 | ||||
| -rw-r--r-- | libical/src/test/regression.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am index 4892507869..8b7f3e9672 100644 --- a/libical/src/test/Makefile.am +++ b/libical/src/test/Makefile.am @@ -1,12 +1,12 @@ -if WITH_CXX -cxx_inc=-DWITH_CXX -cxx_libs=../libical/libical_cxx.la +if WITH_CXX_BINDINGS +cxx_inc=-DWITH_CXX_BINDINGS +cxx_libs=../libical/libical-evolution_cxx.la regression_cxx = regression-cxx.cpp else cxx_inc= cxx_libs= regression_cxx = -CXX=@CC@ +AM_CXX=@CC@ endif if WITH_BDB4 @@ -19,7 +19,7 @@ endif noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process -LDADD = ../libicalss/libicalss.la ../libicalvcal/libicalvcal.la $(cxx_libs) ../libical/libical.la $(bdb4_libs) +LDADD = ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la $(cxx_libs) ../libical/libical-evolution.la $(bdb4_libs) LIBS = @PTHREAD_LIBS@ diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c index 1e9fc8e2c5..d4fc276e6b 100644 --- a/libical/src/test/regression.c +++ b/libical/src/test/regression.c @@ -3646,7 +3646,7 @@ int main(int argc, char *argv[]) /** OPTIONAL TESTS go here... **/ -#ifdef WITH_CXX +#ifdef WITH_CXX_BINDINGS test_run("Test C++ API", test_cxx, do_test, do_header); #endif |