Changeset 94f0b4 in git


Ignore:
Timestamp:
Feb 26, 2021, 10:53:18 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
22ff92e70eab88027fc485df829726f2cd39514998010fedfe2e95183d13fdcdcdee3af8acbd35fcefa2e20d43fc41bb7d2f002794c9545fde4c719a
Parents:
1773b29931f968c9b93375be0f82fef5c6ec62a7
Message:
configure: factory is always required/enabled
File:
1 edited

Legend:

Unmodified
Added
Removed
  • m4/options.m4

    r1773b2 r94f0b4  
    189189AC_DEFUN([SING_USE_FACTORY],
    190190[
    191  AC_MSG_CHECKING(whether factory should be enabled)
    192 
    193  AC_ARG_ENABLE(factory, AS_HELP_STRING([--disable-factory], [Disable factory]),
    194  [if test $enableval = yes; then
    195      ENABLE_FACTORY="yes"
    196   else
    197      ENABLE_FACTORY="no"
    198   fi],[ENABLE_FACTORY="yes"])
    199 
    200  if test x$ENABLE_FACTORY = xyes; then
     191  ENABLE_FACTORY="yes"
     192
    201193
    202194  FACTORY_INCLUDES="-I$ac_abs_top_srcdir -I$ac_abs_top_srcdir/factory -I$ac_abs_top_srcdir/factory/include"
     
    222214  PKG_REQUIRE="$PKG_REQUIRE factory"
    223215  AC_SUBST(PKG_REQUIRE)
    224  fi
    225216
    226217
     
    232223AC_DEFUN([SING_CHECK_FACTORY],
    233224[
    234 AC_ARG_ENABLE(factory, AS_HELP_STRING([--disable-factory], [Disable factory]),
    235 [if test $enableval = yes; then
    236      ENABLE_FACTORY="yes"
    237  else
    238      ENABLE_FACTORY="no"
    239  fi
    240 ],[ENABLE_FACTORY="yes"])
     225  ENABLE_FACTORY="yes"
    241226
    242227  AC_ARG_VAR( [FACTORY_INCLUDES], [INCLUDES for FACTORY] )
    243228  AC_ARG_VAR( [FACTORY_LIBS], [LIBS for FACTORY] )
    244 
    245   AC_MSG_CHECKING(whether factory should be enabled)
    246   if test "x$ENABLE_FACTORY" = xyes; then
    247     AC_MSG_RESULT(yes)
    248229
    249230    AC_MSG_CHECKING([  FACTORY_INCLUDES?..])
     
    277258    PKG_REQUIRE="$PKG_REQUIRE factory"
    278259    AC_SUBST(PKG_REQUIRE)
    279   else
    280     AC_MSG_RESULT(no)
    281   fi
    282260
    283261  AM_CONDITIONAL([ENABLE_FACTORY],[test x$ENABLE_FACTORY = xyes])
Note: See TracChangeset for help on using the changeset viewer.