Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2006-08-09 03:34:51
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6858/wxLua Modified Files: configure Log Message: fix configure to allow setting wxstedit path and lib name Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** configure 8 Aug 2006 22:54:36 -0000 1.38 --- configure 9 Aug 2006 03:34:48 -0000 1.39 *************** *** 882,885 **** --- 882,893 ---- --with-wx-exec-prefix=PREFIX Exec prefix where wxWidgets is installed (optional) + + --with-wxstedit-prefix=PATH + Prefix where wxStEdit is installed + eg. $PATH/include/wx/stedit/*.h (optional) + --with-wxstedit-lib=NAME + Specify directly the lib (and -L path) to link to + eg. -lstedit for shared lib (optional) + --with-motif Uses the wxMotif port (default is auto) --with-gtk Uses the wxGTK port (default is auto) *************** *** 1718,1721 **** --- 1726,1747 ---- wx_config_exec_prefix="" fi; + + # Check whether --with-wxstedit-prefix or --without-wxstedit-prefix was given. + if test "${with_wxstedit_prefix+set}" = set; then + withval="$with_wxstedit_prefix" + wxstedit_prefix="$withval" + else + wxstedit_prefix="" + fi; + + # Check whether --with-wxstedit-lib or --without-wxstedit-lib was given. + if test "${with_wxstedit_lib+set}" = set; then + withval="$with_wxstedit_lib" + wxstedit_lib="$withval" + else + # note an example libwx_gtk2ud_stedit-2.7.so, use "-lwx_gtk2ud_stedit-2.7" + wxstedit_lib="-lstedit" # probably will never exist, only a placeholder + fi; + # don't touch this macro *************** *** 4160,4173 **** fi - - - - - - - - - - if test "$wxWin" != 1; then --- 4186,4189 ---- *************** *** 4206,4230 **** { (exit 1); exit 1; }; } else ! true; fi ! WX_VERSION_FULL="$WX_VERSION" ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` WX_VERSION_MINOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version - - - if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] WX_VERSION: $WX_VERSION" fi ! if test $WX_SHARED = "1"; then STATIC=0 elif test $WX_SHARED = "0"; then --- 4222,4243 ---- { (exit 1); exit 1; }; } else ! true; fi ! WX_VERSION_FULL="$WX_VERSION" ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` WX_VERSION_MINOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] WX_VERSION: $WX_VERSION" fi ! if test $WX_SHARED = "1"; then STATIC=0 elif test $WX_SHARED = "0"; then *************** *** 4236,4500 **** if test $WX_VERSION -gt 26 ; then ! WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) ! if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] Using wx-config --selected_config" echo "[dbg] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" fi ! if test "$UNICODE" = "auto" ; then ! ! echo "$as_me:$LINENO: checking if wxWidgets was built with UNICODE enabled" >&5 ! echo $ECHO_N "checking if wxWidgets was built with UNICODE enabled... $ECHO_C" >&6 ! WX_UNICODE=$(expr "$WX_SELECTEDCONFIG" : ".*unicode.*") ! if test "$WX_UNICODE" != "0"; then ! WX_UNICODE=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! : else - WX_UNICODE=0 - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - : - fi - else - - WX_UNICODE=$UNICODE - fi if test "$DEBUG" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets was built in DEBUG mode" >&5 ! echo $ECHO_N "checking if wxWidgets was built in DEBUG mode... $ECHO_C" >&6 ! ! WX_DEBUG=$(expr "$WX_SELECTEDCONFIG" : ".*debug.*") if test "$WX_DEBUG" != "0"; then WX_DEBUG=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_DEBUG=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_DEBUG=$DEBUG fi - if test "$STATIC" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets was built in STATIC mode" >&5 ! echo $ECHO_N "checking if wxWidgets was built in STATIC mode... $ECHO_C" >&6 ! ! WX_STATIC=$(expr "$WX_SELECTEDCONFIG" : ".*static.*") if test "$WX_STATIC" != "0"; then WX_STATIC=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_STATIC=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_STATIC=$STATIC fi ! WX_PORT="unknown" if test "$GTKPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxGTK" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxGTK... $ECHO_C" >&6 ! ! WX_GTKPORT=$(expr "$WX_SELECTEDCONFIG" : ".*gtk.*") if test "$WX_GTKPORT" != "0"; then WX_GTKPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="gtk" else WX_GTKPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_GTKPORT=$GTKPORT fi - if test "$MOTIFPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMotif" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMotif... $ECHO_C" >&6 ! ! WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") if test "$WX_MOTIFPORT" != "0"; then WX_MOTIFPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="motif" else WX_MOTIFPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MOTIFPORT=$MOTIFPORT fi if test "$MACPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMac" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMac... $ECHO_C" >&6 ! ! WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*") if test "$WX_MACPORT" != "0"; then WX_MACPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mac" else WX_MACPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MACPORT=$MACPORT fi if test "$X11PORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxX11" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxX11... $ECHO_C" >&6 ! ! WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") if test "$WX_X11PORT" != "0"; then WX_X11PORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="x11" else WX_X11PORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_X11PORT=$X11PORT fi - if test "$MGLPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMGL" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMGL... $ECHO_C" >&6 ! ! WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*") if test "$WX_MGLPORT" != "0"; then WX_MGLPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mgl" else WX_MGLPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MGLPORT=$MGLPORT fi - if test "$MSWPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMSW" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMSW... $ECHO_C" >&6 ! ! WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") if test "$WX_MSWPORT" != "0"; then WX_MSWPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="msw" else WX_MSWPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MSWPORT=$MSWPORT fi ! if test "$WX_PORT" = "gtk"; then ! TEMP=auto ! ! if test "$TEMP" = "auto" ; then ! ! echo "$as_me:$LINENO: checking if wxGTK uses GTK 2.x (instead of GTK 1.x)" >&5 ! echo $ECHO_N "checking if wxGTK uses GTK 2.x (instead of GTK 1.x)... $ECHO_C" >&6 ! WX_TEMP=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") ! if test "$WX_TEMP" != "0"; then ! WX_TEMP=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! WX_GTKPORT_VERSION=2 else ! WX_TEMP=0 ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! WX_GTKPORT_VERSION=1 fi - else - WX_TEMP=$TEMP fi - - fi else ! ! if test "$DBG_CONFIGURE" = "1"; then echo "Using WX_CPPFLAGS: $WX_CPPFLAGS" fi - if test "$UNICODE" = "auto" ; then --- 4249,4486 ---- if test $WX_VERSION -gt 26 ; then ! WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) ! if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] Using wx-config --selected_config" echo "[dbg] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" fi + if test "$UNICODE" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets was built with UNICODE enabled" >&5 ! echo $ECHO_N "checking if wxWidgets was built with UNICODE enabled... $ECHO_C" >&6 ! WX_UNICODE=$(expr "$WX_SELECTEDCONFIG" : ".*unicode.*") ! if test "$WX_UNICODE" != "0"; then ! WX_UNICODE=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! : ! else ! WX_UNICODE=0 ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! : ! fi else + WX_UNICODE=$UNICODE + fi if test "$DEBUG" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets was built in DEBUG mode" >&5 + echo $ECHO_N "checking if wxWidgets was built in DEBUG mode... $ECHO_C" >&6 ! WX_DEBUG=$(expr "$WX_SELECTEDCONFIG" : ".*debug.*") if test "$WX_DEBUG" != "0"; then WX_DEBUG=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_DEBUG=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_DEBUG=$DEBUG fi if test "$STATIC" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets was built in STATIC mode" >&5 + echo $ECHO_N "checking if wxWidgets was built in STATIC mode... $ECHO_C" >&6 ! WX_STATIC=$(expr "$WX_SELECTEDCONFIG" : ".*static.*") if test "$WX_STATIC" != "0"; then WX_STATIC=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_STATIC=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_STATIC=$STATIC fi ! WX_PORT="unknown" if test "$GTKPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxGTK" >&5 + echo $ECHO_N "checking if wxWidgets port is wxGTK... $ECHO_C" >&6 ! WX_GTKPORT=$(expr "$WX_SELECTEDCONFIG" : ".*gtk.*") if test "$WX_GTKPORT" != "0"; then WX_GTKPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="gtk" else WX_GTKPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_GTKPORT=$GTKPORT fi if test "$MOTIFPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMotif" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMotif... $ECHO_C" >&6 ! WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") if test "$WX_MOTIFPORT" != "0"; then WX_MOTIFPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="motif" else WX_MOTIFPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MOTIFPORT=$MOTIFPORT fi if test "$MACPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMac" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMac... $ECHO_C" >&6 ! WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*") if test "$WX_MACPORT" != "0"; then WX_MACPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mac" else WX_MACPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MACPORT=$MACPORT fi if test "$X11PORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxX11" >&5 + echo $ECHO_N "checking if wxWidgets port is wxX11... $ECHO_C" >&6 ! WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") if test "$WX_X11PORT" != "0"; then WX_X11PORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="x11" else WX_X11PORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_X11PORT=$X11PORT fi if test "$MGLPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMGL" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMGL... $ECHO_C" >&6 ! WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*") if test "$WX_MGLPORT" != "0"; then WX_MGLPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mgl" else WX_MGLPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MGLPORT=$MGLPORT fi if test "$MSWPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMSW" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMSW... $ECHO_C" >&6 ! WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") if test "$WX_MSWPORT" != "0"; then WX_MSWPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="msw" else WX_MSWPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MSWPORT=$MSWPORT fi + if test "$WX_PORT" = "gtk"; then + TEMP=auto ! if test "$TEMP" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxGTK uses GTK 2.x (instead of GTK 1.x)" >&5 ! echo $ECHO_N "checking if wxGTK uses GTK 2.x (instead of GTK 1.x)... $ECHO_C" >&6 ! WX_TEMP=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") ! if test "$WX_TEMP" != "0"; then ! WX_TEMP=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! WX_GTKPORT_VERSION=2 ! else ! WX_TEMP=0 ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! WX_GTKPORT_VERSION=1 ! fi else ! WX_TEMP=$TEMP fi fi else ! if test "$DBG_CONFIGURE" = "1"; then echo "Using WX_CPPFLAGS: $WX_CPPFLAGS" fi if test "$UNICODE" = "auto" ; then *************** *** 5802,5807 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else - - SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" --- 5788,5791 ---- *************** *** 5809,5827 **** SAVED_LIBS="$LIBS" ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! OLD_WXLIBS=$WX_LIBS ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" ! LIBS="$LIBS $WX_LIBS" ! echo "$as_me:$LINENO: checking if wxSTC contrib is available" >&5 ! echo $ECHO_N "checking if wxSTC contrib is available... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 5793,5810 ---- SAVED_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! OLD_WXLIBS=$WX_LIBS ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" ! LIBS="$LIBS $WX_LIBS" ! echo "$as_me:$LINENO: checking if wxSTC contrib is available" >&5 ! echo $ECHO_N "checking if wxSTC contrib is available... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext *************** *** 5869,5883 **** conftest$ac_exeext conftest.$ac_ext ! if test "$WXSTC_PRESENCE" = "1"; then ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! ac_cv_prog_stc_set=1 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! ac_cv_prog_stc_set=0 ! fi ! WX_LIBS=$OLD_WXLIBS CPPFLAGS="$SAVED_CPPFLAGS" --- 5852,5866 ---- conftest$ac_exeext conftest.$ac_ext ! if test "$WXSTC_PRESENCE" = "1"; then ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! ac_cv_prog_stc_set=1 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! ac_cv_prog_stc_set=0 ! fi ! WX_LIBS=$OLD_WXLIBS CPPFLAGS="$SAVED_CPPFLAGS" *************** *** 5886,5890 **** LIBS="$SAVED_LIBS" - fi --- 5869,5872 ---- *************** *** 5893,5897 **** # add to the library to link to the wxSTC lib ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" else --- 5875,5879 ---- # add to the library to link to the wxSTC lib ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" else *************** *** 5968,6002 **** minversion="1.2.0" ! major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'` ! minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'` ! release=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\3/'` ! ! majsym="STE_""MAJOR""_VERSION" ! minsym="STE_""MINOR""_VERSION" ! relsym="STE_""RELEASE""_VERSION" ! ! COMPCHECK_MSG="if wxStEdit (version >= $minversion) is available" ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! CXXFLAGS="-I$WXSTEDIT/include $CXXFLAGS" ! LIBS="$LIBS -lstedit $WX_LIBS" ! if test -z "$COMPCHECK_MSG"; then ! COMPCHECK_MSG="if wxStEdit is available" ! fi ! echo "$as_me:$LINENO: checking $COMPCHECK_MSG" >&5 ! echo $ECHO_N "checking $COMPCHECK_MSG... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 5950,5984 ---- minversion="1.2.0" + major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'` + minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'` + release=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\3/'` ! majsym="STE_""MAJOR""_VERSION" ! minsym="STE_""MINOR""_VERSION" ! relsym="STE_""RELEASE""_VERSION" + COMPCHECK_MSG="if wxStEdit (version >= $minversion) is available" ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + if test "x$wxstedit_prefix" != x ; then + CXXFLAGS="-I$wxstedit_prefix/include $CXXFLAGS" + fi ! LIBS="$LIBS $wxstedit_lib $WX_LIBS" ! if test -z "$COMPCHECK_MSG"; then ! COMPCHECK_MSG="if wxStEdit is available" ! fi ! echo "$as_me:$LINENO: checking $COMPCHECK_MSG" >&5 ! echo $ECHO_N "checking $COMPCHECK_MSG... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext *************** *** 6007,6026 **** main () { ! wxSTEditor dummy; ! ! // version check ! #if defined($majsym) && defined($minsym) && defined($relsym) ! #if ($majsym > ($major) || \ ! ($majsym == ($major) && $minsym > ($minor)) || \ ! ($majsym == ($major) && $minsym == ($minor) && $relsym >= ($release))) ! // this component is recent enough ! #else ! #error wxStEdit is too old ! At least version $minversion is required ! #endif ! #else ! #error wxStEdit does not define its version symbols $majsym, $minsym, $relsym ! #endif ! ; return 0; --- 5989,6006 ---- main () { + wxSTEditor dummy; ! // version check ! #if defined($majsym) && defined($minsym) && defined($relsym) ! #if ($majsym > ($major) || \ ! ($majsym == ($major) && $minsym > ($minor)) || \ ! ($majsym == ($major) && $minsym == ($minor) && $relsym >= ($release))) ! // this component is recent enough ! #else ! #error wxStEdit is too old ! At least version $minversion is required ! #endif ! #else ! #error wxStEdit does not define its version symbols $majsym, $minsym, $relsym ! #endif ; return 0; *************** *** 6080,6084 **** if test $ac_cv_prog_stedit_set = "1"; then # add to the library to link to the wxStEdit lib ! WX_LIBS="-lstedit $WX_LIBS" else --- 6060,6065 ---- if test $ac_cv_prog_stedit_set = "1"; then # add to the library to link to the wxStEdit lib ! WX_LIBS="$wxstedit_lib $WX_LIBS" ! CXXFLAGS="-I$wxstedit_prefix/include $CXXFLAGS" else |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X