Attachment #668270 for bug #689798

View | Details | Raw Unified | Return to bug 689798
Collapse All | Expand All




                else
                    TOOLKIT="$withval"

                    if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
                            "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
                            "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
                            "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
                        as_fn_error $? "
    Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, motif, x11, mac, mgl, dfb)
                        " "$LINENO" 5
                    fi



            WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
            WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
            WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
            WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
            WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")

            WX_PORT="unknown"
            if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
            if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
            if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
            if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
            if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi

Lines 9-14 Link Here

(-)wxsqlite3-3.2.1/wxsqlite3.pc.in (-1 / +1 lines)
9	Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets	9	Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
10	Version: @VERSION@	10	Version: @VERSION@
11	#Requires: sqlite3	11	#Requires: sqlite3
12	Libs: -L${libdir} -lwxcode_gtk2_wxsqlite3-@WXVERSION@	12	Libs: -L${libdir} -lwxcode_gtk3_wxsqlite3-@WXVERSION@
13	Libs.private: -lpthread	13	Libs.private: -lpthread
14	Cflags: -I${includedir}	14	Cflags: -I${includedir}

Return to bug 689798

Lines 2356-2367 Link Here

(-)wxsqlite3-3.2.1/configure30 (-2 / +4 lines)
2356	else	2356	else
2357	TOOLKIT="$withval"	2357	TOOLKIT="$withval"
2358		2358
2359	if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \	2359	if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
2360	"$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \	2360	"$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
2361	"$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \	2361	"$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
2362	"$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then	2362	"$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
2363	as_fn_error $? "	2363	as_fn_error $? "
2364	Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb)	2364	Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, motif, x11, mac, mgl, dfb)
2365	" "$LINENO" 5	2365	" "$LINENO" 5
2366	fi	2366	fi
2367		2367
Lines 2893-2898 Link Here
2893		2893
2894	WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".gtk1.")	2894	WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".gtk1.")
2895	WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".gtk2.")	2895	WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".gtk2.")
		2896	WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".gtk3.")
2896	WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".msw.")	2897	WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".msw.")
2897	WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".motif.")	2898	WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".motif.")
2898	WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".osx_cocoa.")	2899	WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".osx_cocoa.")
Lines 2904-2909 Link Here
2904	WX_PORT="unknown"	2905	WX_PORT="unknown"
2905	if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi	2906	if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
2906	if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi	2907	if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
		2908	if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
2907	if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi	2909	if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
2908	if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi	2910	if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
2909	if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi	2911	if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi