mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-15 23:59:37 +02:00
Add WXDEBUG_LEVEL=0 to non-debug builds
This commit is contained in:
Leland Lucius
parent
f2d87803d3
commit
e869099643
8
configure
vendored
8
configure
vendored
@ -19245,8 +19245,11 @@ fi
|
||||
if test x"$debug_preference" = "xyes" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
|
||||
$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
|
||||
CFLAGS="${CFLAGS} -g "
|
||||
CXXFLAGS="${CXXFLAGS} -g "
|
||||
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
else
|
||||
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
||||
@ -19364,6 +19367,7 @@ done
|
||||
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for strict prototypes" >&5
|
||||
$as_echo_n "checking CFLAGS for strict prototypes... " >&6; }
|
||||
if ${ac_cv_cflags_strict_prototypes+:} false; then :
|
||||
|
||||
@ -220,8 +220,11 @@ fi
|
||||
if test x"$debug_preference" = "xyes" ; then
|
||||
dnl we want debuging on
|
||||
AC_MSG_NOTICE([Adding -g for debugging to CFLAGS and CXXFLAGS ...])
|
||||
CFLAGS="${CFLAGS} -g "
|
||||
CXXFLAGS="${CXXFLAGS} -g "
|
||||
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
else
|
||||
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
fi
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
@ -232,6 +235,7 @@ dnl check if alloca.h exists. If it does, we need to include it for
|
||||
dnl Solaris builds, by defining HAVE_ALLOCA_H
|
||||
AC_CHECK_HEADERS_ONCE(alloca.h)
|
||||
|
||||
|
||||
dnl --------------------------------------------------------------------------
|
||||
dnl We would like warnings enabled on the builds, but different compilers need
|
||||
dnl different options for these. This bit tries to work out what flags we
|
||||
|
||||
@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
lib_LTLIBRARIES = libFileDialog.la
|
||||
|
||||
libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS)
|
||||
libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
|
||||
libFileDialog_la_LIBADD = $(WX_LIBS)
|
||||
libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
|
||||
|
||||
|
||||
@ -93,11 +93,16 @@ host_triplet = @host@
|
||||
@GTK_TRUE@am__append_3 = \
|
||||
@GTK_TRUE@ gtk/FileDialogPrivate.cpp \
|
||||
@GTK_TRUE@ gtk/FileDialogPrivate.h \
|
||||
@GTK_TRUE@ gtk/private.h \
|
||||
@GTK_TRUE@ $(NULL)
|
||||
|
||||
@MAC_TRUE@am__append_4 = mac/FileDialogPrivate.cpp mac/FileDialogPrivate.h
|
||||
@WINDOWS_TRUE@am__append_5 = win/FileDialogPrivate.cpp win/FileDialogPrivate.h
|
||||
@MAC_TRUE@am__append_4 = mac/FileDialogPrivate.mm \
|
||||
@MAC_TRUE@ mac/FileDialogPrivate.h \
|
||||
@MAC_TRUE@ $(NULL)
|
||||
|
||||
@WINDOWS_TRUE@am__append_5 = win/FileDialogPrivate.cpp \
|
||||
@WINDOWS_TRUE@ win/FileDialogPrivate.h \
|
||||
@WINDOWS_TRUE@ $(NULL)
|
||||
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||
@ -148,9 +153,8 @@ libFileDialog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_2)
|
||||
am__libFileDialog_la_SOURCES_DIST = FileDialog.cpp FileDialog.h \
|
||||
gtk/FileDialogPrivate.cpp gtk/FileDialogPrivate.h \
|
||||
gtk/private.h mac/FileDialogPrivate.cpp \
|
||||
mac/FileDialogPrivate.h win/FileDialogPrivate.cpp \
|
||||
win/FileDialogPrivate.h
|
||||
mac/FileDialogPrivate.mm mac/FileDialogPrivate.h \
|
||||
win/FileDialogPrivate.cpp win/FileDialogPrivate.h
|
||||
am__dirstamp = $(am__leading_dot)dirstamp
|
||||
@GTK_TRUE@am__objects_1 = gtk/libFileDialog_la-FileDialogPrivate.lo
|
||||
@MAC_TRUE@am__objects_2 = mac/libFileDialog_la-FileDialogPrivate.lo
|
||||
@ -197,6 +201,24 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
|
||||
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
|
||||
am__v_CXXLD_0 = @echo " CXXLD " $@;
|
||||
am__v_CXXLD_1 =
|
||||
OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
|
||||
LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=compile $(OBJCXX) $(DEFS) \
|
||||
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||
$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
|
||||
AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
|
||||
am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
|
||||
am__v_OBJCXX_0 = @echo " OBJCXX " $@;
|
||||
am__v_OBJCXX_1 =
|
||||
OBJCXXLD = $(OBJCXX)
|
||||
OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
|
||||
am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
|
||||
am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
|
||||
am__v_OBJCXXLD_1 =
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
@ -323,6 +345,9 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJCXX = @OBJCXX@
|
||||
OBJCXXDEPMODE = @OBJCXXDEPMODE@
|
||||
OBJCXXFLAGS = @OBJCXXFLAGS@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
@ -355,6 +380,7 @@ ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
ac_ct_OBJCXX = @ac_ct_OBJCXX@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
@ -401,16 +427,16 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
EXTRA_DIST = FileDialog.vcproj FileDialogPrivate.h.in
|
||||
lib_LTLIBRARIES = libFileDialog.la
|
||||
libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) $(am__append_1)
|
||||
libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) \
|
||||
-Wno-deprecated-declarations $(am__append_1)
|
||||
libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_2)
|
||||
libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h $(am__append_3) \
|
||||
$(am__append_4) $(am__append_5)
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .cpp .lo .o .obj
|
||||
.SUFFIXES: .cpp .lo .mm .o .obj
|
||||
am--refresh: Makefile
|
||||
@:
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@ -505,7 +531,7 @@ win/libFileDialog_la-FileDialogPrivate.lo: win/$(am__dirstamp) \
|
||||
win/$(DEPDIR)/$(am__dirstamp)
|
||||
|
||||
libFileDialog.la: $(libFileDialog_la_OBJECTS) $(libFileDialog_la_DEPENDENCIES) $(EXTRA_libFileDialog_la_DEPENDENCIES)
|
||||
$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
|
||||
$(AM_V_OBJCXXLD)$(OBJCXXLINK) -rpath $(libdir) $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@ -562,13 +588,6 @@ gtk/libFileDialog_la-FileDialogPrivate.lo: gtk/FileDialogPrivate.cpp
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk/libFileDialog_la-FileDialogPrivate.lo `test -f 'gtk/FileDialogPrivate.cpp' || echo '$(srcdir)/'`gtk/FileDialogPrivate.cpp
|
||||
|
||||
mac/libFileDialog_la-FileDialogPrivate.lo: mac/FileDialogPrivate.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mac/libFileDialog_la-FileDialogPrivate.lo -MD -MP -MF mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo -c -o mac/libFileDialog_la-FileDialogPrivate.lo `test -f 'mac/FileDialogPrivate.cpp' || echo '$(srcdir)/'`mac/FileDialogPrivate.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mac/FileDialogPrivate.cpp' object='mac/libFileDialog_la-FileDialogPrivate.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mac/libFileDialog_la-FileDialogPrivate.lo `test -f 'mac/FileDialogPrivate.cpp' || echo '$(srcdir)/'`mac/FileDialogPrivate.cpp
|
||||
|
||||
win/libFileDialog_la-FileDialogPrivate.lo: win/FileDialogPrivate.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT win/libFileDialog_la-FileDialogPrivate.lo -MD -MP -MF win/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo -c -o win/libFileDialog_la-FileDialogPrivate.lo `test -f 'win/FileDialogPrivate.cpp' || echo '$(srcdir)/'`win/FileDialogPrivate.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) win/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo win/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo
|
||||
@ -576,6 +595,37 @@ win/libFileDialog_la-FileDialogPrivate.lo: win/FileDialogPrivate.cpp
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o win/libFileDialog_la-FileDialogPrivate.lo `test -f 'win/FileDialogPrivate.cpp' || echo '$(srcdir)/'`win/FileDialogPrivate.cpp
|
||||
|
||||
.mm.o:
|
||||
@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
@am__fastdepOBJCXX_TRUE@ $(OBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepOBJCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(OBJCXXCOMPILE) -c -o $@ $<
|
||||
|
||||
.mm.obj:
|
||||
@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
|
||||
@am__fastdepOBJCXX_TRUE@ $(OBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
|
||||
@am__fastdepOBJCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(OBJCXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
|
||||
.mm.lo:
|
||||
@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
|
||||
@am__fastdepOBJCXX_TRUE@ $(LTOBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepOBJCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(LTOBJCXXCOMPILE) -c -o $@ $<
|
||||
|
||||
mac/libFileDialog_la-FileDialogPrivate.lo: mac/FileDialogPrivate.mm
|
||||
@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) -MT mac/libFileDialog_la-FileDialogPrivate.lo -MD -MP -MF mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo -c -o mac/libFileDialog_la-FileDialogPrivate.lo `test -f 'mac/FileDialogPrivate.mm' || echo '$(srcdir)/'`mac/FileDialogPrivate.mm
|
||||
@am__fastdepOBJCXX_TRUE@ $(AM_V_at)$(am__mv) mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='mac/FileDialogPrivate.mm' object='mac/libFileDialog_la-FileDialogPrivate.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) -c -o mac/libFileDialog_la-FileDialogPrivate.lo `test -f 'mac/FileDialogPrivate.mm' || echo '$(srcdir)/'`mac/FileDialogPrivate.mm
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
|
||||
|
||||
465
lib-src/FileDialog/configure
vendored
465
lib-src/FileDialog/configure
vendored
@ -679,6 +679,12 @@ build_vendor
|
||||
build_cpu
|
||||
build
|
||||
LIBTOOL
|
||||
am__fastdepOBJCXX_FALSE
|
||||
am__fastdepOBJCXX_TRUE
|
||||
OBJCXXDEPMODE
|
||||
ac_ct_OBJCXX
|
||||
OBJCXXFLAGS
|
||||
OBJCXX
|
||||
am__fastdepCC_FALSE
|
||||
am__fastdepCC_TRUE
|
||||
CCDEPMODE
|
||||
@ -785,8 +791,6 @@ enable_fast_install
|
||||
with_gnu_ld
|
||||
with_sysroot
|
||||
enable_libtool_lock
|
||||
enable_static_wx
|
||||
enable_unicode
|
||||
enable_debug
|
||||
with_wx_version
|
||||
with_wx_config
|
||||
@ -802,6 +806,8 @@ CPPFLAGS
|
||||
CCC
|
||||
CC
|
||||
CFLAGS
|
||||
OBJCXX
|
||||
OBJCXXFLAGS
|
||||
CPP
|
||||
CXXCPP
|
||||
PKG_CONFIG
|
||||
@ -1441,8 +1447,6 @@ Optional Features:
|
||||
--enable-fast-install[=PKGS]
|
||||
optimize for fast installation [default=yes]
|
||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||
--enable-static-wx link wx statically (default=no)
|
||||
--enable-unicode enable unicode support (default=no)
|
||||
--enable-debug enable debug support (default=none)
|
||||
|
||||
Optional Packages:
|
||||
@ -1466,6 +1470,8 @@ Some influential environment variables:
|
||||
you have headers in a nonstandard directory <include dir>
|
||||
CC C compiler command
|
||||
CFLAGS C compiler flags
|
||||
OBJCXX Objective C++ compiler command
|
||||
OBJCXXFLAGS Objective C++ compiler flags
|
||||
CPP C preprocessor
|
||||
CXXCPP C++ preprocessor
|
||||
PKG_CONFIG path to pkg-config utility
|
||||
@ -1632,6 +1638,44 @@ fi
|
||||
|
||||
} # ac_fn_c_try_compile
|
||||
|
||||
# ac_fn_objcxx_try_compile LINENO
|
||||
# -------------------------------
|
||||
# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
||||
ac_fn_objcxx_try_compile ()
|
||||
{
|
||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||
rm -f conftest.$ac_objext
|
||||
if { { ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo"; } >&5
|
||||
(eval "$ac_compile") 2>conftest.err
|
||||
ac_status=$?
|
||||
if test -s conftest.err; then
|
||||
grep -v '^ *+' conftest.err >conftest.er1
|
||||
cat conftest.er1 >&5
|
||||
mv -f conftest.er1 conftest.err
|
||||
fi
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; } && {
|
||||
test -z "$ac_objcxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then :
|
||||
ac_retval=0
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_retval=1
|
||||
fi
|
||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||
as_fn_set_status $ac_retval
|
||||
|
||||
} # ac_fn_objcxx_try_compile
|
||||
|
||||
# ac_fn_c_try_link LINENO
|
||||
# -----------------------
|
||||
# Try to link conftest.$ac_ext, and return whether this succeeded.
|
||||
@ -4574,6 +4618,383 @@ unknown)
|
||||
;;
|
||||
esac
|
||||
|
||||
ac_ext=mm
|
||||
ac_cpp='$OBJCXXCPP $CPPFLAGS'
|
||||
ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
for ac_prog in g++ objc++ objcxx c++ CXX
|
||||
do
|
||||
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_OBJCXX+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$OBJCXX"; then
|
||||
ac_cv_prog_OBJCXX="$OBJCXX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_OBJCXX="$ac_tool_prefix$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
OBJCXX=$ac_cv_prog_OBJCXX
|
||||
if test -n "$OBJCXX"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXX" >&5
|
||||
$as_echo "$OBJCXX" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$OBJCXX" && break
|
||||
done
|
||||
fi
|
||||
if test -z "$OBJCXX"; then
|
||||
ac_ct_OBJCXX=$OBJCXX
|
||||
for ac_prog in g++ objc++ objcxx c++ CXX
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_ac_ct_OBJCXX+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$ac_ct_OBJCXX"; then
|
||||
ac_cv_prog_ac_ct_OBJCXX="$ac_ct_OBJCXX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_ac_ct_OBJCXX="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_OBJCXX=$ac_cv_prog_ac_ct_OBJCXX
|
||||
if test -n "$ac_ct_OBJCXX"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCXX" >&5
|
||||
$as_echo "$ac_ct_OBJCXX" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$ac_ct_OBJCXX" && break
|
||||
done
|
||||
|
||||
if test "x$ac_ct_OBJCXX" = x; then
|
||||
OBJCXX="g++"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
OBJCXX=$ac_ct_OBJCXX
|
||||
fi
|
||||
fi
|
||||
|
||||
# Provide some information about the compiler.
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C++ compiler version" >&5
|
||||
set X $ac_compile
|
||||
ac_compiler=$2
|
||||
for ac_option in --version -v -V -qversion; do
|
||||
{ { ac_try="$ac_compiler $ac_option >&5"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo"; } >&5
|
||||
(eval "$ac_compiler $ac_option >&5") 2>conftest.err
|
||||
ac_status=$?
|
||||
if test -s conftest.err; then
|
||||
sed '10a\
|
||||
... rest of stderr output deleted ...
|
||||
10q' conftest.err >conftest.er1
|
||||
cat conftest.er1 >&5
|
||||
fi
|
||||
rm -f conftest.er1 conftest.err
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }
|
||||
done
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C++ compiler" >&5
|
||||
$as_echo_n "checking whether we are using the GNU Objective C++ compiler... " >&6; }
|
||||
if ${ac_cv_objcxx_compiler_gnu+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef __GNUC__
|
||||
choke me
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_objcxx_try_compile "$LINENO"; then :
|
||||
ac_compiler_gnu=yes
|
||||
else
|
||||
ac_compiler_gnu=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
ac_cv_objcxx_compiler_gnu=$ac_compiler_gnu
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objcxx_compiler_gnu" >&5
|
||||
$as_echo "$ac_cv_objcxx_compiler_gnu" >&6; }
|
||||
if test $ac_compiler_gnu = yes; then
|
||||
GOBJCXX=yes
|
||||
else
|
||||
GOBJCXX=
|
||||
fi
|
||||
ac_test_OBJCXXFLAGS=${OBJCXXFLAGS+set}
|
||||
ac_save_OBJCXXFLAGS=$OBJCXXFLAGS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJCXX accepts -g" >&5
|
||||
$as_echo_n "checking whether $OBJCXX accepts -g... " >&6; }
|
||||
if ${ac_cv_prog_objcxx_g+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_save_objcxx_werror_flag=$ac_objcxx_werror_flag
|
||||
ac_objcxx_werror_flag=yes
|
||||
ac_cv_prog_objcxx_g=no
|
||||
OBJCXXFLAGS="-g"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_objcxx_try_compile "$LINENO"; then :
|
||||
ac_cv_prog_objcxx_g=yes
|
||||
else
|
||||
OBJCXXFLAGS=""
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_objcxx_try_compile "$LINENO"; then :
|
||||
|
||||
else
|
||||
ac_objcxx_werror_flag=$ac_save_objcxx_werror_flag
|
||||
OBJCXXFLAGS="-g"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_objcxx_try_compile "$LINENO"; then :
|
||||
ac_cv_prog_objcxx_g=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
ac_objcxx_werror_flag=$ac_save_objcx_werror_flag
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objcxx_g" >&5
|
||||
$as_echo "$ac_cv_prog_objcxx_g" >&6; }
|
||||
if test "$ac_test_OBJCXXFLAGS" = set; then
|
||||
OBJCXXFLAGS=$ac_save_OBJCXXFLAGS
|
||||
elif test $ac_cv_prog_objcxx_g = yes; then
|
||||
if test "$GOBJCXX" = yes; then
|
||||
OBJCXXFLAGS="-g -O2"
|
||||
else
|
||||
OBJCXXFLAGS="-g"
|
||||
fi
|
||||
else
|
||||
if test "$GOBJCXX" = yes; then
|
||||
OBJCXXFLAGS="-O2"
|
||||
else
|
||||
OBJCXXFLAGS=
|
||||
fi
|
||||
fi
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
depcc="$OBJCXX" am_compiler_list='gcc3 gcc'
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
||||
$as_echo_n "checking dependency style of $depcc... " >&6; }
|
||||
if ${am_cv_OBJCXX_dependencies_compiler_type+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
||||
# We make a subdir and do the tests there. Otherwise we can end up
|
||||
# making bogus files that we don't know about and never remove. For
|
||||
# instance it was reported that on HP-UX the gcc test will end up
|
||||
# making a dummy file named 'D' -- because '-MD' means "put the output
|
||||
# in D".
|
||||
rm -rf conftest.dir
|
||||
mkdir conftest.dir
|
||||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||||
# using a relative directory.
|
||||
cp "$am_depcomp" conftest.dir
|
||||
cd conftest.dir
|
||||
# We will build objects and dependencies in a subdirectory because
|
||||
# it helps to detect inapplicable dependency modes. For instance
|
||||
# both Tru64's cc and ICC support -MD to output dependencies as a
|
||||
# side effect of compilation, but ICC will put the dependencies in
|
||||
# the current directory while Tru64 will put them in the object
|
||||
# directory.
|
||||
mkdir sub
|
||||
|
||||
am_cv_OBJCXX_dependencies_compiler_type=none
|
||||
if test "$am_compiler_list" = ""; then
|
||||
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
||||
fi
|
||||
am__universal=false
|
||||
|
||||
|
||||
for depmode in $am_compiler_list; do
|
||||
# Setup a source with many dependencies, because some compilers
|
||||
# like to wrap large dependency lists on column 80 (with \), and
|
||||
# we should not choose a depcomp mode which is confused by this.
|
||||
#
|
||||
# We need to recreate these files for each test, as the compiler may
|
||||
# overwrite some of them when testing with obscure command lines.
|
||||
# This happens at least with the AIX C compiler.
|
||||
: > sub/conftest.c
|
||||
for i in 1 2 3 4 5 6; do
|
||||
echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
||||
# Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
|
||||
# Solaris 10 /bin/sh.
|
||||
echo '/* dummy */' > sub/conftst$i.h
|
||||
done
|
||||
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
||||
|
||||
# We check with '-c' and '-o' for the sake of the "dashmstdout"
|
||||
# mode. It turns out that the SunPro C++ compiler does not properly
|
||||
# handle '-M -o', and we need to detect this. Also, some Intel
|
||||
# versions had trouble with output in subdirs.
|
||||
am__obj=sub/conftest.${OBJEXT-o}
|
||||
am__minus_obj="-o $am__obj"
|
||||
case $depmode in
|
||||
gcc)
|
||||
# This depmode causes a compiler race in universal mode.
|
||||
test "$am__universal" = false || continue
|
||||
;;
|
||||
nosideeffect)
|
||||
# After this tag, mechanisms are not by side-effect, so they'll
|
||||
# only be used when explicitly requested.
|
||||
if test "x$enable_dependency_tracking" = xyes; then
|
||||
continue
|
||||
else
|
||||
break
|
||||
fi
|
||||
;;
|
||||
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
||||
# This compiler won't grok '-c -o', but also, the minuso test has
|
||||
# not run yet. These depmodes are late enough in the game, and
|
||||
# so weak that their functioning should not be impacted.
|
||||
am__obj=conftest.${OBJEXT-o}
|
||||
am__minus_obj=
|
||||
;;
|
||||
none) break ;;
|
||||
esac
|
||||
if depmode=$depmode \
|
||||
source=sub/conftest.c object=$am__obj \
|
||||
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
||||
$SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
||||
>/dev/null 2>conftest.err &&
|
||||
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
||||
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
||||
grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
||||
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
||||
# icc doesn't choke on unknown options, it will just issue warnings
|
||||
# or remarks (even with -Werror). So we grep stderr for any message
|
||||
# that says an option was ignored or not supported.
|
||||
# When given -MP, icc 7.0 and 7.1 complain thusly:
|
||||
# icc: Command line warning: ignoring option '-M'; no argument required
|
||||
# The diagnosis changed in icc 8.0:
|
||||
# icc: Command line remark: option '-MP' not supported
|
||||
if (grep 'ignoring option' conftest.err ||
|
||||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
||||
am_cv_OBJCXX_dependencies_compiler_type=$depmode
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
cd ..
|
||||
rm -rf conftest.dir
|
||||
else
|
||||
am_cv_OBJCXX_dependencies_compiler_type=none
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJCXX_dependencies_compiler_type" >&5
|
||||
$as_echo "$am_cv_OBJCXX_dependencies_compiler_type" >&6; }
|
||||
OBJCXXDEPMODE=depmode=$am_cv_OBJCXX_dependencies_compiler_type
|
||||
|
||||
if
|
||||
test "x$enable_dependency_tracking" != xno \
|
||||
&& test "$am_cv_OBJCXX_dependencies_compiler_type" = gcc3; then
|
||||
am__fastdepOBJCXX_TRUE=
|
||||
am__fastdepOBJCXX_FALSE='#'
|
||||
else
|
||||
am__fastdepOBJCXX_TRUE='#'
|
||||
am__fastdepOBJCXX_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
case `pwd` in
|
||||
*\ * | *\ *)
|
||||
@ -15486,27 +15907,11 @@ fi
|
||||
#
|
||||
# Check for debug
|
||||
#
|
||||
# Check whether --enable-static-wx was given.
|
||||
if test "${enable_static_wx+set}" = set; then :
|
||||
enableval=$enable_static_wx; static_wx_preference="--static=$enableval"
|
||||
else
|
||||
static_wx_preference=""
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-unicode was given.
|
||||
if test "${enable_unicode+set}" = set; then :
|
||||
enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
|
||||
else
|
||||
unicode_preference=""
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-debug was given.
|
||||
if test "${enable_debug+set}" = set; then :
|
||||
enableval=$enable_debug; debug_preference="--debug=$enableval"
|
||||
enableval=$enable_debug; debug_preference="yes"
|
||||
else
|
||||
debug_preference=""
|
||||
debug_preference="no"
|
||||
fi
|
||||
|
||||
|
||||
@ -15580,12 +15985,22 @@ if [ "$WX_CONFIG" = "no" ] ; then
|
||||
fi
|
||||
|
||||
|
||||
wxconfigargs="$static_wx_preference $unicode_preference $debug_preference $wx_preference"
|
||||
wxconfigargs="$wx_preference"
|
||||
WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
|
||||
WX_LIBS=""
|
||||
|
||||
|
||||
|
||||
if test x"$debug_preference" = "xyes" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
|
||||
$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
|
||||
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
else
|
||||
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk3 use in wxWidgets" >&5
|
||||
$as_echo_n "checking for gtk3 use in wxWidgets... " >&6; }
|
||||
CPPFLAGS="${WX_CXXFLAGS}"
|
||||
@ -16045,6 +16460,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
||||
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${am__fastdepOBJCXX_TRUE}" && test -z "${am__fastdepOBJCXX_FALSE}"; then
|
||||
as_fn_error $? "conditional \"am__fastdepOBJCXX\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then
|
||||
as_fn_error $? "conditional \"GTK\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
|
||||
@ -20,6 +20,7 @@ AC_LANG_CPLUSPLUS
|
||||
#
|
||||
AC_PROG_CXX
|
||||
AM_PROG_AR
|
||||
AC_PROG_OBJCXX
|
||||
|
||||
LT_INIT
|
||||
|
||||
@ -31,20 +32,10 @@ AC_HEADER_STDC
|
||||
#
|
||||
# Check for debug
|
||||
#
|
||||
AC_ARG_ENABLE(static-wx,
|
||||
[AS_HELP_STRING([--enable-static-wx],[link wx statically (default=no)])],
|
||||
static_wx_preference="--static=$enableval",
|
||||
static_wx_preference="")
|
||||
|
||||
AC_ARG_ENABLE(unicode,
|
||||
[AS_HELP_STRING([--enable-unicode],[enable unicode support (default=no)])],
|
||||
unicode_preference="--unicode=$enableval",
|
||||
unicode_preference="")
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
[AS_HELP_STRING([--enable-debug],[enable debug support (default=none)])],
|
||||
debug_preference="--debug=$enableval",
|
||||
debug_preference="")
|
||||
debug_preference="yes",
|
||||
debug_preference="no")
|
||||
|
||||
AC_ARG_WITH(wx-version,
|
||||
[AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [2.6,2.8]])],
|
||||
@ -64,12 +55,22 @@ fi
|
||||
|
||||
dnl Gather wx arguments
|
||||
|
||||
wxconfigargs="$static_wx_preference $unicode_preference $debug_preference $wx_preference"
|
||||
wxconfigargs="$wx_preference"
|
||||
WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
|
||||
WX_LIBS=""
|
||||
AC_SUBST([WX_CXXFLAGS])
|
||||
AC_SUBST([WX_LIBS])
|
||||
|
||||
if test x"$debug_preference" = "xyes" ; then
|
||||
dnl we want debuging on
|
||||
AC_MSG_NOTICE([Adding -g for debugging to CFLAGS and CXXFLAGS ...])
|
||||
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
else
|
||||
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for gtk3 use in wxWidgets])
|
||||
CPPFLAGS="${WX_CXXFLAGS}"
|
||||
AC_EGREP_CPP(wxWidgets built with GTK3,
|
||||
|
||||
@ -7,6 +7,6 @@ pkgconfig_DATA = libwidgetextra.pc
|
||||
|
||||
lib_LTLIBRARIES = libwidgetextra.la
|
||||
|
||||
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
|
||||
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
|
||||
libwidgetextra_la_LIBADD = $(WX_LIBS)
|
||||
libwidgetextra_la_SOURCES = NonGuiThread.cpp NonGuiThread.h
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.14.1 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -16,7 +16,17 @@
|
||||
|
||||
|
||||
VPATH = @srcdir@
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__is_gnu_make = { \
|
||||
if test -z '$(MAKELEVEL)'; then \
|
||||
false; \
|
||||
elif test -n '$(MAKE_HOST)'; then \
|
||||
true; \
|
||||
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||
true; \
|
||||
else \
|
||||
false; \
|
||||
fi; \
|
||||
}
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
@ -80,18 +90,6 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = .
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/configure $(am__configure_deps) \
|
||||
$(srcdir)/libwidgetextra.pc.in $(top_srcdir)/autotools/depcomp \
|
||||
INSTALL autotools/ar-lib autotools/compile \
|
||||
autotools/config.guess autotools/config.sub autotools/depcomp \
|
||||
autotools/install-sh autotools/missing autotools/ltmain.sh \
|
||||
$(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \
|
||||
$(top_srcdir)/autotools/config.guess \
|
||||
$(top_srcdir)/autotools/config.sub \
|
||||
$(top_srcdir)/autotools/install-sh \
|
||||
$(top_srcdir)/autotools/ltmain.sh \
|
||||
$(top_srcdir)/autotools/missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_strict_prototypes.m4 \
|
||||
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
|
||||
@ -102,6 +100,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_strict_prototypes.m4 \
|
||||
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
|
||||
$(am__configure_deps) $(am__DIST_COMMON)
|
||||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
configure.lineno config.status.lineno
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
@ -225,6 +225,17 @@ ETAGS = etags
|
||||
CTAGS = ctags
|
||||
CSCOPE = cscope
|
||||
AM_RECURSIVE_TARGETS = cscope
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libwidgetextra.pc.in \
|
||||
$(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \
|
||||
$(top_srcdir)/autotools/config.guess \
|
||||
$(top_srcdir)/autotools/config.sub \
|
||||
$(top_srcdir)/autotools/depcomp \
|
||||
$(top_srcdir)/autotools/install-sh \
|
||||
$(top_srcdir)/autotools/ltmain.sh \
|
||||
$(top_srcdir)/autotools/missing INSTALL autotools/ar-lib \
|
||||
autotools/compile autotools/config.guess autotools/config.sub \
|
||||
autotools/depcomp autotools/install-sh autotools/ltmain.sh \
|
||||
autotools/missing
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
@ -370,7 +381,7 @@ EXTRA_DIST = libwidgetextra.pc.in
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libwidgetextra.pc
|
||||
lib_LTLIBRARIES = libwidgetextra.la
|
||||
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
|
||||
libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
|
||||
libwidgetextra_la_LIBADD = $(WX_LIBS)
|
||||
libwidgetextra_la_SOURCES = NonGuiThread.cpp NonGuiThread.h
|
||||
all: all-am
|
||||
@ -392,7 +403,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
*config.status*) \
|
||||
@ -632,15 +642,15 @@ dist-xz: distdir
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-tarZ: distdir
|
||||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "Support for distribution archives compressed with" \
|
||||
"legacy program 'compress' is deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-shar: distdir
|
||||
@echo WARNING: "Support for distribution archives compressed with" \
|
||||
"legacy program 'compress' is deprecated." >&2
|
||||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
||||
$(am__post_remove_distdir)
|
||||
@ -676,17 +686,17 @@ distcheck: dist
|
||||
esac
|
||||
chmod -R a-w $(distdir)
|
||||
chmod u+w $(distdir)
|
||||
mkdir $(distdir)/_build $(distdir)/_inst
|
||||
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
|
||||
chmod a-w $(distdir)
|
||||
test -d $(distdir)/_build || exit 0; \
|
||||
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
||||
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
||||
&& am__cwd=`pwd` \
|
||||
&& $(am__cd) $(distdir)/_build \
|
||||
&& ../configure \
|
||||
&& $(am__cd) $(distdir)/_build/sub \
|
||||
&& ../../configure \
|
||||
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
|
||||
$(DISTCHECK_CONFIGURE_FLAGS) \
|
||||
--srcdir=.. --prefix="$$dc_install_base" \
|
||||
--srcdir=../.. --prefix="$$dc_install_base" \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) check \
|
||||
@ -870,6 +880,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
|
||||
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
29
lib-src/lib-widget-extra/configure
vendored
29
lib-src/lib-widget-extra/configure
vendored
@ -771,8 +771,6 @@ enable_fast_install
|
||||
with_gnu_ld
|
||||
with_sysroot
|
||||
enable_libtool_lock
|
||||
enable_static_wx
|
||||
enable_unicode
|
||||
enable_debug
|
||||
with_wx_version
|
||||
'
|
||||
@ -1421,8 +1419,6 @@ Optional Features:
|
||||
--enable-fast-install[=PKGS]
|
||||
optimize for fast installation [default=yes]
|
||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||
--enable-static-wx link wx statically [default=no]
|
||||
--enable-unicode enable unicode support [default=yes]
|
||||
--enable-debug enable debug support [default=no]
|
||||
|
||||
Optional Packages:
|
||||
@ -16210,22 +16206,6 @@ CPPFLAGS="$cppflags_save"
|
||||
CXXFLAGS="$cxxflags_save"
|
||||
|
||||
|
||||
# Check whether --enable-static-wx was given.
|
||||
if test "${enable_static_wx+set}" = set; then :
|
||||
enableval=$enable_static_wx; static_wx_preference="--static=$enableval"
|
||||
else
|
||||
static_wx_preference=""
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-unicode was given.
|
||||
if test "${enable_unicode+set}" = set; then :
|
||||
enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
|
||||
else
|
||||
unicode_preference="--unicode=yes"
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-debug was given.
|
||||
if test "${enable_debug+set}" = set; then :
|
||||
enableval=$enable_debug; debug_preference="$enableval"
|
||||
@ -16244,11 +16224,14 @@ fi
|
||||
|
||||
|
||||
|
||||
if test "$debug_preference" = "yes"; then
|
||||
if test x"$debug_preference" = "xyes" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
|
||||
$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
|
||||
CFLAGS="${CFLAGS} -g "
|
||||
CXXFLAGS="${CXXFLAGS} -g "
|
||||
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
else
|
||||
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -45,18 +45,6 @@ CXXFLAGS="$cxxflags_save"
|
||||
|
||||
dnl Build Options
|
||||
|
||||
AC_ARG_ENABLE(static-wx,
|
||||
[AS_HELP_STRING([--enable-static-wx],
|
||||
[link wx statically [default=no]])],
|
||||
static_wx_preference="--static=$enableval",
|
||||
static_wx_preference="")
|
||||
|
||||
AC_ARG_ENABLE(unicode,
|
||||
[AS_HELP_STRING([--enable-unicode],
|
||||
[enable unicode support [default=yes]])],
|
||||
unicode_preference="--unicode=$enableval",
|
||||
unicode_preference="--unicode=yes")
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
[AS_HELP_STRING([--enable-debug],
|
||||
[enable debug support [default=no]])],
|
||||
@ -68,17 +56,20 @@ AC_ARG_WITH(wx-version,
|
||||
[select wxWidgets version (if both installed) [2.8,]])],
|
||||
wx_preference="--version=$withval",
|
||||
wx_preference="")
|
||||
dnl Right now only support wx 2.8
|
||||
dnl Right now only support wx 3.0
|
||||
|
||||
dnl ----------------------------------------------------
|
||||
dnl If user asked for debug, put debug in compiler flags
|
||||
dnl ----------------------------------------------------
|
||||
|
||||
if test "$debug_preference" = "yes"; then
|
||||
if test x"$debug_preference" = "xyes" ; then
|
||||
dnl we want debuging on
|
||||
AC_MSG_NOTICE([Adding -g for debugging to CFLAGS and CXXFLAGS ...])
|
||||
CFLAGS="${CFLAGS} -g "
|
||||
CXXFLAGS="${CXXFLAGS} -g "
|
||||
CFLAGS="${CFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
CXXFLAGS="${CXXFLAGS} -g -DWXDEBUG_LEVEL=1"
|
||||
else
|
||||
CFLAGS="${CFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
CXXFLAGS="${CXXFLAGS} -DWXDEBUG_LEVEL=0"
|
||||
fi
|
||||
|
||||
dnl --------------------------------------------------------------------------
|
||||
|
||||
@ -47,6 +47,7 @@ libaudacity_la_SOURCES = \
|
||||
$(NULL)
|
||||
|
||||
audacity_CPPFLAGS = \
|
||||
-Wno-deprecated-declarations \
|
||||
-D__STDC_CONSTANT_MACROS \
|
||||
-DLIBDIR=\"$(libdir)\" \
|
||||
$(EXPAT_CFLAGS) \
|
||||
|
||||
@ -1111,7 +1111,8 @@ libaudacity_la_SOURCES = \
|
||||
xml/XMLTagHandler.h \
|
||||
$(NULL)
|
||||
|
||||
audacity_CPPFLAGS = -D__STDC_CONSTANT_MACROS -DLIBDIR=\"$(libdir)\" \
|
||||
audacity_CPPFLAGS = -Wno-deprecated-declarations \
|
||||
-D__STDC_CONSTANT_MACROS -DLIBDIR=\"$(libdir)\" \
|
||||
$(EXPAT_CFLAGS) $(FILEDIALOG_CFLAGS) $(PORTAUDIO_CFLAGS) \
|
||||
$(PORTMIXER_CFLAGS) $(SNDFILE_CFLAGS) $(SOXR_CFLAGS) \
|
||||
$(WIDGETEXTRA_CFLAGS) $(WX_CXXFLAGS) $(NULL) $(am__append_1) \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user