X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=configure.in;h=ed1eb1ed5ba19e7f209f1f00d9befc4599ba4ad5;hp=1d07fab9f7ee301db9824d92aaa4c415673df69c;hb=ef51c848bee7f082b2fc42e4e3802c1155edf550;hpb=1f0aa49ffeccf4ac8562a82a941b17c63503c4cc diff --git a/configure.in b/configure.in index 1d07fab..ed1eb1e 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) dnl AC_CONFIG_HEADERS([config.h:config.h.in]) -AM_INIT_AUTOMAKE(libt2n, 0.1) +AM_INIT_AUTOMAKE(libt2n, 0.4) AC_DEFINE(PROTOCOL_VERSION, 1, [protocol version used (integers, increase version if incompatible)]) @@ -11,8 +11,8 @@ AC_PROG_CXX AM_PROG_LIBTOOL dnl check for doxygen -AC_PATH_PROG(DOXYGEN, doxygen, $PATH) -AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN); +AC_PATH_PROG(DOXYGEN, doxygen) +AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN) AM_CONDITIONAL(AUTOCHECK, test "$enable_autocheck" = yes) AM_PATH_CPPUNIT(1.8.0) @@ -28,17 +28,17 @@ AC_SUBST(XMLPP_CFLAGS) AC_SUBST(XMLPP_LIBS) dnl fake installed libt2n (codegen) for example-codegen -dnl todo: remove codegen include path (codegen-stubhead.hxx will be removed) -LIBT2N_CPPFLAGS="-I\$(top_srcdir)/src @BOOST_CPPFLAGS@ @CPPUNIT_CFLAGS@ -I\$(top_srcdir)/codegen" -LIBT2N_LIBS="\$(top_builddir)/src/libt2n.la @BOOST_SERIALIZATION_LIB@ @BOOST_LDFLAGS@" -LIBT2N_CODEGEN="\$(top_builddir)/codegen/libt2n-codegen" -LIBT2N_CLIENT_PCTEMPLATE="\$(top_srcdir)/codegen/clientlib.pc.in" -LIBT2N_CODEGEN_MAKESNIPPET="include \$(top_srcdir)/codegen/codegen.make" - -AC_SUBST(LIBT2N_CPPFLAGS) +dnl LIBT2N_CFLAGS="-I\$(top_srcdir)/src @BOOST_CPPFLAGS@ @CPPUNIT_CFLAGS@ -I\$(top_srcdir)/codegen" +dnl LIBT2N_LIBS="\$(top_builddir)/src/libt2n.la @BOOST_SERIALIZATION_LIB@ @BOOST_LDFLAGS@" +dnl LIBT2N_CODEGEN="\$(top_builddir)/codegen/libt2n-codegen" +dnl LIBT2N_CLIENT_PCTEMPLATE="\$(top_srcdir)/codegen/clientlib.pc.in" + +AC_SUBST(LIBT2N_CFLAGS) AC_SUBST(LIBT2N_LIBS) AC_SUBST(LIBT2N_CODEGEN) AC_SUBST(LIBT2N_CLIENT_PCTEMPLATE) -AC_SUBST(LIBT2N_CODEGEN_MAKESNIPPET) + +dnl todo: do not create .pc file in configure but in make +dnl see also autoconf manual "Installation Directory Variables" -AC_OUTPUT(Makefile doc/Doxyfile doc/Makefile src/Makefile libt2n.pc libt2n.spec test/Makefile examples/Makefile codegen/Makefile example-codegen/Makefile) +AC_OUTPUT(Makefile doc/Doxyfile doc/Makefile src/Makefile libt2n.pc libt2n.spec test/Makefile examples/Makefile codegen/Makefile examples-codegen/Makefile)