Browse Source

* 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.
tags/v0.99.beta14
Sam Hocevar sam 19 years ago
parent
commit
747dfe797f
2 changed files with 11 additions and 18 deletions
  1. +7
    -18
      configure.ac
  2. +4
    -0
      cpp/Makefile.am

+ 7
- 18
configure.ac View File

@@ -51,7 +51,7 @@ AC_ARG_ENABLE(vga,

dnl language bindings
AC_ARG_ENABLE(cpp,
[ --enable-cpp C++ bindings (autodetected)])
[ --enable-cpp C++ bindings (default disabled)])

dnl example programs features
AC_ARG_ENABLE(imlib2,
@@ -85,13 +85,6 @@ AC_TRY_COMPILE([],[asm("fldln2; fldln2; fxch; fyl2x");],

AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")


if test "${enable_cpp}" != "no"; then
ac_cv_my_have_cpp="yes"
AC_DEFINE(USE_CPP, 1,
Define to 1 to enable C++ bindigs)
fi

CACA_DRIVERS=""

if test "${enable_conio}" != "no"; then
@@ -250,16 +243,12 @@ CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
# (Comme quoi on est pas les seuls porcs)
CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"

# Build the PIC library?
case "${target_os}" in
*mingw32* | *cygwin* | *djgpp*)
NEED_PIC=false
;;
*)
NEED_PIC=:
;;
esac
AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
# Build the C++ bindings?
ac_cv_my_have_cpp="no"
if test "${enable_cpp}" = "yes"; then
ac_cv_my_have_cpp="yes"
fi
AM_CONDITIONAL(USE_CPP, test "${ac_cv_my_have_cpp}" = "yes")

# Use Imlib2?
ac_cv_my_have_imlib2="no"


+ 4
- 0
cpp/Makefile.am View File

@@ -2,8 +2,10 @@

AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca

if USE_CPP
include_HEADERS = cucul++.h caca++.h
lib_LTLIBRARIES = libcucul++.la libcaca++.la
endif

libcucul___la_SOURCES = cucul++.cpp cucul++.h
libcucul___la_LDFLAGS = -no-undefined -version-info @LT_VERSION@
@@ -13,7 +15,9 @@ libcaca___la_SOURCES = caca++.cpp caca++.h
libcaca___la_LDFLAGS = -no-undefined -version-info @LT_VERSION@
libcaca___la_LIBADD = ../caca/libcaca.la

if USE_CPP
noinst_PROGRAMS = cpptest
endif

cpptest_SOURCES = cpptest.cpp
cpptest_LDADD = libcaca++.la libcucul++.la ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@


Loading…
Cancel
Save