$NetBSD: patch-ab,v 1.16 2016/04/03 12:43:39 joerg Exp $ - need to check for wchar.h - configure the included wxWidgets to use pksrc png/jpeg/tiff/xpm instead of its own copies (note: the included wxWidgets currently isn't being used, but this change will be wanted again if it ever comes back) - don't overwrite pkgsrc CFLAGS/CXXFLAGS - fix install paths for pkgsrc - don't add __cplusplus, any proper C++ compiler will define it already --- Amaya/configure.orig 2009-12-09 13:42:57.000000000 +0000 +++ Amaya/configure @@ -5471,7 +5471,7 @@ done -for ac_header in stdio.h +for ac_header in stdio.h wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -13689,11 +13689,11 @@ echo "$as_me: error: wxWidgets library s # --enable-unicode compile wxString with Unicode support # --with-gtk use GTK+ # --with-opengl use OpenGL (or Mesa) - WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin --with-libxpm=builtin $WXCONFIGURE_TUNNING_OPTION" + WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys --with-libxpm=sys --disable-precomp-headers $WXCONFIGURE_TUNNING_OPTION" fi if test "$AMAYAOS" = "MACOSX" ; then # MACOSX - WXCONFIGURE_OPTION="--with-opengl --disable-shared --disable-tga --enable-unicode --with-libpng=builtin --with-libjpeg=builtin" + WXCONFIGURE_OPTION="--with-opengl --disable-shared --disable-tga --enable-unicode --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys --with-libxpm=sys" fi if test $with_wxdebug = yes ; then WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug" @@ -13810,8 +13810,8 @@ if test "$with_debug" = "yes" ; then CXXFLAGS="-g" else with_debug="no" - CFLAGS="-O2" - CXXFLAGS="-O2" + #CFLAGS="-O2" + #CXXFLAGS="-O2" fi if test "${CC}" = "gcc" ; then @@ -13833,8 +13833,7 @@ CFLAGS="${CFLAGS} -x c" # C++ options (-x c++) #CXXFLAGS="${CXXFLAGS} -Wall" -CXX_OPTIONS="-D__cplusplus" -CXXFLAGS="${CXXFLAGS} -Wall -x c++ ${CXX_OPTIONS}" +CXXFLAGS="${CXXFLAGS} -Wall -x c++" # setup LDFLAGS # on macosx, specific flags must be set to avoid conflicts with allready installed libwww @@ -14785,7 +14784,7 @@ if test "${VPATHOPT}" = "" ; then VPATHOPT="VPATH" fi -AMAYA_INSTALLDIR="Amaya" +AMAYA_INSTALLDIR="share/Amaya"