From d122c36066e318ce4b2fa4e1eccf5c43af76ad9d Mon Sep 17 00:00:00 2001 From: Bryan Jurish Date: Mon, 1 Dec 2008 08:46:08 +0000 Subject: + updated local/system libgfsm logic in configure.in svn path=/trunk/externals/moocow/; revision=10410 --- gfsm/Changes | 3 +- gfsm/configure.in | 99 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/gfsm/Changes b/gfsm/Changes index 82abe51..594bc8f 100644 --- a/gfsm/Changes +++ b/gfsm/Changes @@ -1,8 +1,9 @@ Change log for PD external 'pd-gfsm' -v0.05 Sun, 30 Nov 2008 00:08:06 +0100 +v0.05 Mon, 01 Dec 2008 09:41:35 +0100 + added local copy of gfsm source tree in gfsm/ subdir (for pd-extended auto-builds) + external builds now use static local libgfsm by default (insulates vs. API change, etc.) + + added ./configure argument --enable-system-gfsm: link to system (vs. local) libgfsm v0.0403 Tue, 11 Dec 2007 22:33:18 +0100 + updated for gfsm-0.0.10-pre1 (noconfig.h, config.h preprocessor magic) diff --git a/gfsm/configure.in b/gfsm/configure.in index efaf727..e34dce9 100644 --- a/gfsm/configure.in +++ b/gfsm/configure.in @@ -135,70 +135,75 @@ dnl pkg-config dnl ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## gfsm:local -AC_ARG_ENABLE([static-gfsm], - AC_HELP_STRING([--enable-static-gfsm], [Use local static libgfsm rather than system library (default=yes)]), - [ac_cv_enable_static_gfsm="$enableval"], - [ac_cv_enable_static_gfsm="yes"]) - -AC_MSG_CHECKING([whether to build static local libgfsm]) -if test "$ac_cv_enable_static_gfsm" = "yes"; then - AC_MSG_RESULT(yes) +## gfsm:select +AC_ARG_ENABLE([system-gfsm], + AC_HELP_STRING([--enable-system-gfsm], + [Use system-wide (shared) libgfsm if present (default=no)]), + [ac_cv_enable_system_gfsm="$enableval"], + [ac_cv_enable_system_gfsm="no"]) + +if test "$ac_cv_enable_system_gfsm" = "yes" ; then + PKG_CHECK_MODULES(GFSM, [gfsm >= 0.0.8], [PC_HAVE_GFSM="yes"], [PC_HAVE_GFSM=""]) + + if test "$PC_HAVE_GFSM" != "yes" ; then + AC_MSG_WARN([]) + AC_MSG_WARN([----------------------------------------------------------------]) + AC_MSG_WARN([ system-wide gfsm library not found!]) + AC_MSG_WARN([ - Is the directory containing gfsm.pc in your]) + AC_MSG_WARN([ 'PKG_CONFIG_PATH' environment variable?]) + AC_MSG_WARN([ - falling back to static local libgfsm]) + AC_MSG_WARN([----------------------------------------------------------------]) + AC_MSG_WARN([]) + ac_cv_have_system_gfsm="no" + ac_cv_enable_system_gfsm="no" + else + ac_cv_have_system_gfsm="yes" + fi +fi +## /gfsm:select +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## gfsm:flags +## +AC_MSG_CHECKING([which libgfsm to use]) + +if test "$ac_cv_enable_system_gfsm" != "yes"; then + ##-- gfsm:local + AC_MSG_RESULT([local]) AC_CONFIG_SUBDIRS(gfsm) PD_GFSM_SUBDIRS="gfsm" + ##-- gfsm:local: flags IFLAGS="$IFLAGS -I\$(top_srcdir)/gfsm/src/libgfsm -I\$(top_builddir)/gfsm/src/libgfsm \`\$(PKG_CONFIG) --cflags-only-I \$(top_srcdir)/gfsm/gfsm.pc\`" LFLAGS="$LFLAGS -L\$(top_builddir)/gfsm/src/libgfsm \`\$(PKG_CONFIG) --cflags-only-I \$(top_srcdir)/gfsm/gfsm.pc\`" LIBS="$LIBS \$(top_builddir)/gfsm/src/libgfsm/libgfsm.la \`\$(PKG_CONFIG) --libs-only-l \$(top_srcdir)/gfsm/gfsm.pc | sed -e's/\-lgfsm//g'\`" - AC_DEFINE(PD_GFSM_WHICH, ["static"], [Which version of gfsm are we using?]) + PD_GFSM_WHICH="static local" + else + ##-- gfsm:system + AC_MSG_RESULT([system]) PD_GFSM_SUBDIRS="" - AC_MSG_RESULT(no) + PD_GFSM_WHICH="system global" + + ##-- gfsm:system: flags + IFLAGS="$IFLAGS `$PKG_CONFIG --cflags-only-I gfsm`" + LFLAGS="$LFLAGS `$PKG_CONFIG --libs-only-L gfsm`" + LIBS="$LIBS `$PKG_CONFIG --libs-only-l gfsm`" fi -AC_SUBST(PD_GFSM_SUBDIRS) -AC_DEFINE_UNQUOTED(PD_GFSM_DATE, "`date`", [Date this external was configured]) -AC_DEFINE_UNQUOTED(PD_GFSM_USER, "$USER", [User who configured this external]) +AC_SUBST(PD_GFSM_SUBDIRS) +AC_DEFINE_UNQUOTED(PD_GFSM_WHICH, "$PD_GFSM_WHICH", [Which version of gfsm are we using?]) +AC_DEFINE_UNQUOTED(PD_GFSM_DATE, "`date`", [Date this external was configured]) +AC_DEFINE_UNQUOTED(PD_GFSM_USER, "$USER", [User who configured this external]) ## /gfsm:local ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## gfsm:system (pkg-config) -if test "$ac_cv_enable_static_gfsm" = "no"; then - PKG_CHECK_MODULES(GFSM, gfsm >= 0.0.8, - [PC_HAVE_GFSM="yes"], - [PC_HAVE_GFSM=""]) - - if test "$PC_HAVE_GFSM" != "yes" ; then - AC_MSG_WARN([]) - AC_MSG_WARN([----------------------------------------------------------------]) - AC_MSG_WARN([ gfsm library not found!]) - AC_MSG_WARN([]) - AC_MSG_WARN([ Is the directory containing gfsm.pc in your]) - AC_MSG_WARN([ 'PKG_CONFIG_PATH' environment variable?]) - AC_MSG_WARN([----------------------------------------------------------------]) - AC_MSG_WARN([]) - ac_cv_have_gfsm="no" - else - ac_cv_have_gfsm="yes" - fi - - if test "$ac_cv_have_gfsm" != "no" ; then - ##-- gfsm: library - IFLAGS="$IFLAGS `$PKG_CONFIG --cflags-only-I gfsm`" - LFLAGS="$LFLAGS `$PKG_CONFIG --libs-only-L gfsm`" - LIBS="$LIBS `$PKG_CONFIG --libs-only-l gfsm`" - AC_DEFINE(PD_GFSM_WHICH, ["system"], [Which version of gfsm are we using?]) - fi -fi -## /gfsm:system -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## gfsm:any AC_ARG_ENABLE(gfsm, - AC_HELP_STRING([--disable-gfsm], [Globally disable gfsm support (causes build to fail!)]), + AC_HELP_STRING([--disable-gfsm], [Globally disable gfsm support (causes build to fail)]), [ac_cv_enable_gfsm="$enableval"], [ac_cv_enable_gfsm="yes"]) -- cgit v1.2.1