Ignore:
Timestamp:
Aug 10, 2005, 7:24:59 AM (15 years ago)
Author:
pguyot (Paul Guyot)
Message:

Clean up autoconf macros.
Test the presence of libcurl.
Compilation & link flags for libcurl.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/configure.ac

    r13402 r13443  
    8181OD_TCL_PACKAGE_DIR
    8282
    83 # Check if thread package is already installed.
     83# Check if thread is enabled.
    8484OD_TCL_THREAD_SUPPORT
    8585
     86## libcurl
     87OD_LIBCURL_FLAGS
     88
     89# Determine if we need to install some bundled packages
     90OUR_INCLUDED_PACKAGES=
     91
     92## Thread package.
     93AC_ARG_WITH(
     94                included-tclthread,
     95                [  --with-included-tclthread install included Thread package.],
     96                [with_included_tclthread=$withval],
     97                [with_included_tclthread="unspecified"])
     98
     99# Check if thread package is already installed.
     100if test "x$with_included_tclthread" = "xunspecified" ; then
     101        OD_TCL_PACKAGE(
     102                [Thread],
     103                [AC_MSG_RESULT([yes]); with_included_tclthread=no],
     104                [AC_MSG_RESULT([no]); with_included_tclthread=yes])
     105fi
     106
    86107# If thread package isn't installed, configure and install thread package.
    87 if test "$with_tclthread" = "yes"; then
    88         OUR_TCL_THREAD_PACKAGE=thread2.6
     108if test "$with_included_tclthread" = "yes"; then
     109        OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES thread2.6"
    89110        AC_CONFIG_SUBDIRS([src/thread2.6])
    90111        # Extract thread package
     
    92113        # Patch thread package (so thread2.6 is the vanilla distribution directory)
    93114        patch -p0 < src/thread2.6.diff
    94 else
    95         OUR_TCL_THREAD_PACKAGE=
    96115fi
    97 AC_SUBST(OUR_TCL_THREAD_PACKAGE)
     116
     117AC_SUBST(OUR_INCLUDED_PACKAGES)
    98118
    99119# Allows building of shared libraries
Note: See TracChangeset for help on using the changeset viewer.