Changeset 837


Ignore:
Timestamp:
Apr 22, 2006, 8:54:38 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Fixed --enable-cpp to actually do something. Also, disabled it by default for the release, because it's not up to date and needs a lot of polishing.
Location:
libcaca/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r835 r837  
    5252dnl language bindings
    5353AC_ARG_ENABLE(cpp,
    54   [  --enable-cpp            C++ bindings (autodetected)])
     54  [  --enable-cpp            C++ bindings (default disabled)])
    5555
    5656dnl example programs features
     
    8585
    8686AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
    87 
    88 
    89 if test "${enable_cpp}" != "no"; then
    90   ac_cv_my_have_cpp="yes"
    91   AC_DEFINE(USE_CPP, 1,
    92                 Define to 1 to enable C++ bindigs)
    93 fi
    9487
    9588CACA_DRIVERS=""
     
    251244CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
    252245
    253 # Build the PIC library?
    254 case "${target_os}" in
    255   *mingw32* | *cygwin* | *djgpp*)
    256     NEED_PIC=false
    257     ;;
    258   *)
    259     NEED_PIC=:
    260     ;;
    261 esac
    262 AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
     246# Build the C++ bindings?
     247ac_cv_my_have_cpp="no"
     248if test "${enable_cpp}" = "yes"; then
     249  ac_cv_my_have_cpp="yes"
     250fi
     251AM_CONDITIONAL(USE_CPP, test "${ac_cv_my_have_cpp}" = "yes")
    263252
    264253# Use Imlib2?
  • libcaca/trunk/cpp/Makefile.am

    r830 r837  
    33AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    44
     5if USE_CPP
    56include_HEADERS = cucul++.h caca++.h
    67lib_LTLIBRARIES = libcucul++.la libcaca++.la
     8endif
    79
    810libcucul___la_SOURCES = cucul++.cpp cucul++.h
     
    1416libcaca___la_LIBADD = ../caca/libcaca.la
    1517
     18if USE_CPP
    1619noinst_PROGRAMS = cpptest
     20endif
    1721
    1822cpptest_SOURCES = cpptest.cpp
Note: See TracChangeset for help on using the changeset viewer.