Conditional build of tclish.

git-svn-id: https://klish.googlecode.com/svn/trunk@290 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb

Makefile.in

@@ -38,7 +38,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = bin/clish$(EXEEXT) bin/konfd$(EXEEXT) bin/konf$(EXEEXT) \
-	bin/tclish@TCL_VERSION@$(EXEEXT) $(am__EXEEXT_1)
+	$(am__EXEEXT_1) $(am__EXEEXT_2)
 DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/bin/module.am \
@@ -85,8 +85,9 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 	aux_scripts/config.guess aux_scripts/config.sub \
 	aux_scripts/depcomp aux_scripts/install-sh \
 	aux_scripts/ltmain.sh aux_scripts/missing
-@LUBHEAP_TRUE@am__append_1 = bin/lubheap
-@LUBHEAP_TRUE@am__append_2 = lub/heap/cache.c lub/heap/cache.h \
+@TCL_TRUE@am__append_1 = bin/tclish@TCL_VERSION@
+@LUBHEAP_TRUE@am__append_2 = bin/lubheap
+@LUBHEAP_TRUE@am__append_3 = lub/heap/cache.c lub/heap/cache.h \
 @LUBHEAP_TRUE@	lub/heap/cache_bucket.c lub/heap/context.c \
 @LUBHEAP_TRUE@	lub/heap/context.h lub/heap/heap__get_max_free.c \
 @LUBHEAP_TRUE@	lub/heap/heap__get_stacktrace.c \
@@ -148,10 +149,10 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 @LUBHEAP_TRUE@	lub/partition/private.h \
 @LUBHEAP_TRUE@	lub/partition/posix/posix_partition.c \
 @LUBHEAP_TRUE@	lub/partition/posix/private.h
-@LUBHEAP_TRUE@am__append_3 = liblubheap.la
+@LUBHEAP_TRUE@am__append_4 = liblubheap.la
 noinst_PROGRAMS = test/bintree$(EXEEXT) test/string$(EXEEXT) \
-	$(am__EXEEXT_2)
-@LUBHEAP_TRUE@am__append_4 = \
+	$(am__EXEEXT_3)
+@LUBHEAP_TRUE@am__append_5 = \
 @LUBHEAP_TRUE@    test/heap                  \
 @LUBHEAP_TRUE@    test/mallocTest            \
 @LUBHEAP_TRUE@    test/lubMallocTest
@@ -430,8 +431,9 @@ libtinyxml_la_OBJECTS = $(am_libtinyxml_la_OBJECTS)
 libtinyxml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libtinyxml_la_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@LUBHEAP_TRUE@am__EXEEXT_1 = bin/lubheap$(EXEEXT)
-@LUBHEAP_TRUE@am__EXEEXT_2 = test/heap$(EXEEXT) \
+@TCL_TRUE@am__EXEEXT_1 = bin/tclish@TCL_VERSION@$(EXEEXT)
+@LUBHEAP_TRUE@am__EXEEXT_2 = bin/lubheap$(EXEEXT)
+@LUBHEAP_TRUE@am__EXEEXT_3 = test/heap$(EXEEXT) \
 @LUBHEAP_TRUE@	test/mallocTest$(EXEEXT) \
 @LUBHEAP_TRUE@	test/lubMallocTest$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -448,14 +450,17 @@ am__bin_lubheap_SOURCES_DIST = bin/lubheap.c
 @LUBHEAP_TRUE@am_bin_lubheap_OBJECTS = bin/lubheap.$(OBJEXT)
 bin_lubheap_OBJECTS = $(am_bin_lubheap_OBJECTS)
 bin_lubheap_DEPENDENCIES =
-am_bin_tclish@TCL_VERSION@_OBJECTS = bin/tclish.$(OBJEXT) \
-	bin/tclish_fini_callback.$(OBJEXT) \
-	bin/tclish_init_callback.$(OBJEXT) \
-	bin/tclish_script_callback.$(OBJEXT) \
-	bin/tclish_show_result.$(OBJEXT)
+am__bin_tclish@TCL_VERSION@_SOURCES_DIST = bin/tclish.cpp \
+	bin/tclish_fini_callback.c bin/tclish_init_callback.c \
+	bin/tclish_script_callback.c bin/tclish_show_result.c
+@TCL_TRUE@am_bin_tclish@TCL_VERSION@_OBJECTS = bin/tclish.$(OBJEXT) \
+@TCL_TRUE@	bin/tclish_fini_callback.$(OBJEXT) \
+@TCL_TRUE@	bin/tclish_init_callback.$(OBJEXT) \
+@TCL_TRUE@	bin/tclish_script_callback.$(OBJEXT) \
+@TCL_TRUE@	bin/tclish_show_result.$(OBJEXT)
 bin_tclish@TCL_VERSION@_OBJECTS =  \
 	$(am_bin_tclish@TCL_VERSION@_OBJECTS)
-bin_tclish@TCL_VERSION@_DEPENDENCIES = libclish.la
+@TCL_TRUE@bin_tclish@TCL_VERSION@_DEPENDENCIES = libclish.la
 am_test_bintree_OBJECTS = test/bintree.$(OBJEXT)
 test_bintree_OBJECTS = $(am_test_bintree_OBJECTS)
 test_bintree_DEPENDENCIES = liblub.la
@@ -520,8 +525,8 @@ DIST_SOURCES = $(libclish_la_SOURCES) $(libkonf_la_SOURCES) \
 	$(libtinyxml_la_SOURCES) $(bin_clish_SOURCES) \
 	$(bin_konf_SOURCES) $(bin_konfd_SOURCES) \
 	$(am__bin_lubheap_SOURCES_DIST) \
-	$(bin_tclish@TCL_VERSION@_SOURCES) $(test_bintree_SOURCES) \
-	$(am__test_heap_SOURCES_DIST) \
+	$(am__bin_tclish@TCL_VERSION@_SOURCES_DIST) \
+	$(test_bintree_SOURCES) $(am__test_heap_SOURCES_DIST) \
 	$(am__test_lubMallocTest_SOURCES_DIST) \
 	$(am__test_mallocTest_SOURCES_DIST) $(test_string_SOURCES)
 HEADERS = $(nobase_include_HEADERS)
@@ -680,7 +685,7 @@ AM_LD = $(CXX)
 @DEBUG_TRUE@DEBUG_CFLAGS = -DDEBUG
 AM_CFLAGS = -pedantic -Wall $(DEBUG_CFLAGS)
 AM_CXXFLAGS = -Wall $(DEBUG_CFLAGS)
-lib_LTLIBRARIES = libclish.la liblub.la $(am__append_3) libtinyrl.la \
+lib_LTLIBRARIES = libclish.la liblub.la $(am__append_4) libtinyrl.la \
 	libtinyxml.la libkonf.la
 lib_LIBRARIES = 
 nobase_include_HEADERS = clish/command.h clish/param.h clish/pargv.h \
@@ -747,22 +752,22 @@ bin_konf_LDADD = \
     @KONF_LIBS@ \
     @LUB_LIBS@
 
-bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
-    bin/tclish_fini_callback.c   \
-    bin/tclish_init_callback.c   \
-    bin/tclish_script_callback.c \
-    bin/tclish_show_result.c
-
-bin_tclish@TCL_VERSION@_LDADD = \
-    libclish.la                   \
-    @KONF_LIBS@                   \
-    @TINYRL_LIBS@                 \
-    @TINYXML_LIBS@                \
-    @TCL_LIBS@                    \
-    @LUBHEAP_LIBS@                \
-    @LUB_LIBS@                    \
-    @PTHREAD_LIBS@                \
-    @BFD_LIBS@
+@TCL_TRUE@bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
+@TCL_TRUE@    bin/tclish_fini_callback.c   \
+@TCL_TRUE@    bin/tclish_init_callback.c   \
+@TCL_TRUE@    bin/tclish_script_callback.c \
+@TCL_TRUE@    bin/tclish_show_result.c
+
+@TCL_TRUE@bin_tclish@TCL_VERSION@_LDADD = \
+@TCL_TRUE@    libclish.la                   \
+@TCL_TRUE@    @KONF_LIBS@                   \
+@TCL_TRUE@    @TINYRL_LIBS@                 \
+@TCL_TRUE@    @TINYXML_LIBS@                \
+@TCL_TRUE@    @TCL_LIBS@                    \
+@TCL_TRUE@    @LUBHEAP_LIBS@                \
+@TCL_TRUE@    @LUB_LIBS@                    \
+@TCL_TRUE@    @PTHREAD_LIBS@                \
+@TCL_TRUE@    @BFD_LIBS@
 
 @LUBHEAP_TRUE@bin_lubheap_SOURCES = bin/lubheap.c
 @LUBHEAP_TRUE@bin_lubheap_LDADD = \
@@ -830,7 +835,7 @@ liblub_la_SOURCES = lub/argv/argv__get_arg.c lub/argv/argv__get_argv.c \
 	lub/dblockpool/dblockpool_fini.c \
 	lub/dblockpool/dblockpool_free.c \
 	lub/dblockpool/dblockpool_init.c lub/dblockpool/private.h \
-	lub/dump/dump.c lub/dump/private.h $(am__append_2) \
+	lub/dump/dump.c lub/dump/private.h $(am__append_3) \
 	lub/string/string_cat.c lub/string/string_catn.c \
 	lub/string/string_dup.c lub/string/string_dupn.c \
 	lub/string/string_free.c lub/string/string_nocasecmp.c \

bin/module.am

@@ -22,15 +22,17 @@ bin_konf_LDADD  = \
     @KONF_LIBS@ \
     @LUB_LIBS@
 
-bin_PROGRAMS += bin/tclish@TCL_VERSION@
+## If TCL is enabled
+if TCL
+  bin_PROGRAMS += bin/tclish@TCL_VERSION@
 
-bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
+  bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
     bin/tclish_fini_callback.c   \
     bin/tclish_init_callback.c   \
     bin/tclish_script_callback.c \
     bin/tclish_show_result.c
 
-bin_tclish@TCL_VERSION@_LDADD   = \
+  bin_tclish@TCL_VERSION@_LDADD   = \
     libclish.la                   \
     @KONF_LIBS@                   \
     @TINYRL_LIBS@                 \
@@ -40,6 +42,7 @@ bin_tclish@TCL_VERSION@_LDADD   = \
     @LUB_LIBS@                    \
     @PTHREAD_LIBS@                \
     @BFD_LIBS@
+endif
 
 if LUBHEAP
   bin_PROGRAMS += bin/lubheap

configure

@@ -748,6 +748,8 @@ LUBHEAP_CFLAGS
 LUBHEAP_LIBS
 LUBHEAP_FALSE
 LUBHEAP_TRUE
+TCL_FALSE
+TCL_TRUE
 TCL_VERSION
 TCL_LIBS
 TCL_CFLAGS
@@ -4680,13 +4682,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4683: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4685: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4686: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4688: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4689: output\"" >&5)
+  (eval echo "\"\$as_me:4691: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5889,7 +5891,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5892 "configure"' > conftest.$ac_ext
+  echo '#line 5894 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7813,11 +7815,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7816: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7818: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7820: \$? = $ac_status" >&5
+   echo "$as_me:7822: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8152,11 +8154,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8157: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8159: \$? = $ac_status" >&5
+   echo "$as_me:8161: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8257,11 +8259,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8262: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8264: \$? = $ac_status" >&5
+   echo "$as_me:8266: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8312,11 +8314,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8315: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8317: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8319: \$? = $ac_status" >&5
+   echo "$as_me:8321: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10695,7 +10697,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10698 "configure"
+#line 10700 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10791,7 +10793,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10794 "configure"
+#line 10796 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12747,11 +12749,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12750: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12752: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12754: \$? = $ac_status" >&5
+   echo "$as_me:12756: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12846,11 +12848,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12849: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12853: \$? = $ac_status" >&5
+   echo "$as_me:12855: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12898,11 +12900,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12901: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12903: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12905: \$? = $ac_status" >&5
+   echo "$as_me:12907: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15183,6 +15185,7 @@ $as_echo "#define HAVE_LIBTCL /**/" >>confdefs.h
 
 
 
+            have_tcl="yes"
 
 fi
 
@@ -15195,6 +15198,14 @@ fi
 
 fi
 
+ if test "x${have_tcl}" = "xyes"; then
+  TCL_TRUE=
+  TCL_FALSE='#'
+else
+  TCL_TRUE='#'
+  TCL_FALSE=
+fi
+
 
 ################################
 # Check for inclusion of lub_heap
@@ -15207,7 +15218,7 @@ else
 fi
 
 
- if test x$enable_lubheap = xyes; then
+ if test "x$enable_lubheap" = "xyes"; then
   LUBHEAP_TRUE=
   LUBHEAP_FALSE='#'
 else
@@ -15495,6 +15506,10 @@ if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
   as_fn_error "conditional \"DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${TCL_TRUE}" && test -z "${TCL_FALSE}"; then
+  as_fn_error "conditional \"TCL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${LUBHEAP_TRUE}" && test -z "${LUBHEAP_FALSE}"; then
   as_fn_error "conditional \"LUBHEAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

@@ -169,10 +169,12 @@ if test -e $TCL_CONFIG; then
             AC_SUBST(TCL_CFLAGS)
             AC_SUBST(TCL_LIBS)
             AC_SUBST(TCL_VERSION)
+            have_tcl="yes"
         ])
     )
 fi
 )
+AM_CONDITIONAL(TCL,test "x${have_tcl}" = "xyes")
 
 ################################
 # Check for inclusion of lub_heap
@@ -183,7 +185,7 @@ AC_ARG_ENABLE(lubheap,
     [],
     [enable_lubheap=no])
 
-AM_CONDITIONAL(LUBHEAP,test x$enable_lubheap = xyes)
+AM_CONDITIONAL(LUBHEAP,test "x$enable_lubheap" = "xyes")
 
 if test "x$enable_lubheap" = "xyes"; then
     AC_MSG_WARN([Replacing standard memory libraries with lubheap])