--- libgig/trunk/configure.in 2007/05/27 13:54:24 1209 +++ libgig/trunk/configure.in 2011/06/11 17:53:24 2182 @@ -4,8 +4,8 @@ # Library's "official" release version: LIBGIG_RELEASE_MAJOR=3 -LIBGIG_RELEASE_MINOR=1 -LIBGIG_RELEASE_BUILD=1 +LIBGIG_RELEASE_MINOR=3 +LIBGIG_RELEASE_BUILD=0.cvs1 #------------------------------------------------------------------------------------ # The following is the libtool / shared library version. This doesn't have to @@ -24,18 +24,19 @@ # 6. If any interfaces have been removed since the last public release, then set age # to 0. -LIBGIG_LT_CURRENT=7 +LIBGIG_LT_CURRENT=10 LIBGIG_LT_REVISION=0 -LIBGIG_LT_AGE=1 +LIBGIG_LT_AGE=4 SHARED_VERSION_INFO="$LIBGIG_LT_CURRENT:$LIBGIG_LT_REVISION:$LIBGIG_LT_AGE" -AC_C_BIGENDIAN - AC_LANG_CPLUSPLUS AC_PROG_CXX +AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL +AC_C_BIGENDIAN + AC_SUBST(SHLIB_VERSION_ARG) AC_SUBST(SHARED_VERSION_INFO) AC_SUBST(LIBGIG_RELEASE_MAJOR) @@ -71,10 +72,30 @@ AC_CHECK_HEADERS(uuid/uuid.h) AC_SEARCH_LIBS(uuid_generate, uuid) -AC_CHECK_FUNCS(uuid_generate CFUUIDCreate) +AC_CHECK_FUNCS(uuid_generate) + +case "$host" in + *mingw*|*cygwin*) + win32=yes + ;; + *) + win32=no + ;; +esac +AM_CONDITIONAL(WIN32, test "$win32" = "yes") + +case "$host" in + *-*-darwin*) + mac=yes + ;; + *) + mac=no + ;; +esac +AM_CONDITIONAL(MAC, test "$mac" = "yes") -if test "$ac_cv_func_uuid_generate" = no -a "$ac_cv_func_CFUUIDCreate" = no; then - AC_MSG_WARN([No UUID generate function found. +if test "$ac_cv_func_uuid_generate" = no -a "$mac" = no -a "$win32" = no; then + AC_MSG_WARN([No UUID generate function found. *** libgig will not be able to create DLSIDs in DLS and gig files. *** Install libuuid from e2fsprogs to solve this. Package might be called *** uuid-dev, libext2fs2-devel or e2fsprogs-devel.])