X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=configure.in;h=c293a10b2a5a67fcfe9c7f6bbde01539965e1ade;hp=65137d840ca11b65cc144c0f629ef88bcaf1f5c6;hb=9c627fabb9df8ed74cdfa83f83cb7bd996ee1004;hpb=44a58adde741c1cde579b8d2a678906023475536 diff --git a/configure.in b/configure.in index 65137d8..c293a10 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.3) 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) @@ -27,18 +27,18 @@ PKG_CHECK_MODULES(XMLPP, libxml++-2.6 >= 2.8.1) AC_SUBST(XMLPP_CFLAGS) AC_SUBST(XMLPP_LIBS) -dnl fake installed libt2n (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_PC_IN = "\$(top_srcdir)/codegen/clientlib.pc.in" -LIBT2N_CODEGEN_MAKESNIPPET="\$(top_srcdir)/codegen/codegen.make" +dnl fake installed libt2n (codegen) for example-codegen +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_CPPFLAGS) +AC_SUBST(LIBT2N_CFLAGS) AC_SUBST(LIBT2N_LIBS) AC_SUBST(LIBT2N_CODEGEN) -AC_SUBST(LIBT2N_CLIENT_PC_IN) -AC_SUBST(LIBT2N_CODEGEN_MAKESNIPPET) +AC_SUBST(LIBT2N_CLIENT_PCTEMPLATE) + +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)