X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=d3cc586678ac872a122ec764ad0d9cdc893a3d8e;hb=6721bd30f7bbe241500f9086411db1b21040e32f;hp=4c5e747f98df3005258f210adde3325abcecd1e1;hpb=f07fd9a6b5dd45066653056729e8cc66125baee1;p=platform%2Fupstream%2Fisl.git diff --git a/configure.ac b/configure.ac index 4c5e747..d3cc586 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ AC_INIT AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(isl, 0.01) +AM_INIT_AUTOMAKE(isl, 0.02) AC_SUBST(versioninfo) -versioninfo=1:0:0 +versioninfo=2:0:0 AC_PROG_CC @@ -38,17 +38,13 @@ AC_CHECK_DECLS(mp_get_memory_functions,[],[ CPPFLAGS="$SAVE_CPPFLAGS" AM_CONDITIONAL(NEED_GET_MEMORY_FUNCTIONS, test x$need_get_memory_functions = xtrue) -AX_SUBMODULE(piplib,no|system|build|bundled,no) +AX_SUBMODULE(piplib,no|system|build,no) have_piplib=false AC_SUBST(PIPLIB_CPPFLAGS) AC_SUBST(PIPLIB_LDFLAGS) AC_SUBST(PIPLIB_LIBS) case "$with_piplib" in - bundled) - PIPLIB_CPPFLAGS="-I$srcdir/piplib/include" - isl_configure_args="$isl_configure_args --with-bits=gmp" - ;; build) PIPLIB_CPPFLAGS="-I$piplib_srcdir/include" PIPLIB_LIBS="$with_piplib_builddir/libpiplibMP.la" @@ -84,18 +80,17 @@ if test "$with_piplib" != "no"; then have_piplib=true fi AM_CONDITIONAL(HAVE_PIPLIB, test x$have_piplib = xtrue) -AM_CONDITIONAL(BUNDLED_PIPLIB, test $with_piplib = bundled) PACKAGE_CFLAGS="-I$prefix/include/isl" AX_CREATE_PKGCONFIG_INFO +AX_DETECT_GIT_HEAD +echo '#define GIT_HEAD_ID "'$GIT_HEAD_ID'"' > gitversion.h + AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(include/isl_config.h) AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(doc/Makefile) -if test $with_piplib = bundled; then - AC_CONFIG_SUBDIRS(piplib) -fi AC_CONFIG_COMMANDS_POST([ dnl pass on arguments to subdir configures, but don't dnl add them to config.status