--- liblscp/trunk/configure.ac 2006/12/18 09:39:20 983 +++ liblscp/trunk/configure.ac 2020/12/17 08:36:44 3842 @@ -1,8 +1,11 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(src/client.c) -AM_CONFIG_HEADER(src/config.h) +AC_INIT(liblscp, 0.9.0, rncbc@rncbc.org, liblscp) -AM_INIT_AUTOMAKE(liblscp, 0.5.1) +AC_CONFIG_SRCDIR(src/client.c) +AC_CONFIG_HEADERS([src/config.h]) +AC_CONFIG_MACRO_DIRS([.m4]) + +AM_INIT_AUTOMAKE #------------------------------------------------------------------------------------ # Rules for library version information: @@ -20,12 +23,31 @@ # 6. If any interfaces have been removed since the last public release, then set age # to 0. -SHARED_VERSION_INFO="2:0:0" +SHARED_VERSION_INFO="6:3:0" AC_SUBST(SHARED_VERSION_INFO) +# Build version string. +AC_CACHE_VAL([ac_cv_build_version], [ + ac_cv_build_version=$(git describe --tags --dirty --abbrev=6 2>/dev/null) + if test -n "$ac_cv_build_version"; then + ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[^0-9]]\+//') + ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/-g/git./') + ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/[[_|-]]\+/./g') + ac_cv_build_version_extra=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) + if test "x$ac_cv_build_version_extra" != "xmaster"; then + ac_cv_build_version="$ac_cv_build_version [[$ac_cv_build_version_extra]]" + fi + else + ac_cv_build_version=$PACKAGE_VERSION + fi +]) +ac_build_version="$ac_cv_build_version" +AC_SUBST(ac_build_version) + # Checks for programs. AC_PROG_CC +AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AM_PROG_LIBTOOL @@ -40,6 +62,12 @@ # Checks for library functions. AC_CHECK_FUNCS(strdup strtok_r memset memmove socket connect bind listen setsockopt getsockopt getsockname gethostbyname) +case $host in + *mingw*|*cygwin*) windows=yes ;; + *) windows=no ;; +esac +AM_CONDITIONAL(WINDOWS, test "$windows" = "yes") + # Checks for pthread library. AC_CHECK_LIB(pthread, pthread_create) @@ -50,5 +78,5 @@ AC_CHECK_PROG(ac_doxygen, doxygen, [doc], []) AC_SUBST(ac_doxygen) -AC_OUTPUT(Makefile src/Makefile lscp/Makefile examples/Makefile debian/Makefile doc/Makefile doc/liblscp.doxygen lscp.pc liblscp.spec lscp/version.h) +AC_OUTPUT(Makefile src/Makefile lscp/Makefile examples/Makefile doc/Makefile doc/liblscp.doxygen lscp.pc liblscp.spec lscp/version.h)