Author: rpmcruz Date: Fri Dec 14 10:11:58 2007 New Revision: 43070 URL: http://svn.opensuse.org/viewcvs/yast?rev=43070&view=rev Log: Removing -- these are automatically generated. Modified: trunk/gtk/unstable-libyui/config.h trunk/gtk/unstable-libyui/config.h.in trunk/gtk/unstable-libyui/configure trunk/gtk/unstable-libyui/configure.in Modified: trunk/gtk/unstable-libyui/config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/config.h?rev=... ============================================================================== --- trunk/gtk/unstable-libyui/config.h (original) +++ trunk/gtk/unstable-libyui/config.h Fri Dec 14 10:11:58 2007 @@ -64,9 +64,6 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "2.15.9" -/* defined if using an older SL10.1 era zypp */ -/* #undef PRE_ZYPP_3 */ - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. Modified: trunk/gtk/unstable-libyui/config.h.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/config.h.in?r... ============================================================================== --- trunk/gtk/unstable-libyui/config.h.in (original) +++ trunk/gtk/unstable-libyui/config.h.in Fri Dec 14 10:11:58 2007 @@ -63,9 +63,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* defined if using an older SL10.1 era zypp */ -#undef PRE_ZYPP_3 - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. Modified: trunk/gtk/unstable-libyui/configure URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/configure?rev... ============================================================================== --- trunk/gtk/unstable-libyui/configure (original) +++ trunk/gtk/unstable-libyui/configure Fri Dec 14 10:11:58 2007 @@ -20474,7 +20474,6 @@ fi - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { echo "$as_me:$LINENO: checking for working alloca.h" >&5 @@ -21009,21 +21008,6 @@ fi -{ echo "$as_me:$LINENO: checking for zypp 3" >&5 -echo $ECHO_N "checking for zypp 3... $ECHO_C" >&6; } -if test -f /usr/include/zypp/SourceManager.h; then - -cat >>confdefs.h <<_ACEOF -#define PRE_ZYPP_3 1 -_ACEOF - - { echo "$as_me:$LINENO: result: pre 3" >&5 -echo "${ECHO_T}pre 3" >&6; } -else - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } -fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -21500,19 +21484,29 @@ _ACEOF -{ echo "$as_me:$LINENO: checking for old libyui" >&5 -echo $ECHO_N "checking for old libyui... $ECHO_C" >&6; } PYUI_LIBS='-lpy2UI' -if test $yast_vers -le 2015006; then - PYUI_LIBS='-lyui' - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } -else - { echo "$as_me:$LINENO: result: use new lib" >&5 -echo "${ECHO_T}use new lib" >&6; } -fi +if test $yast_vers -lt 2015012; then + { { echo "$as_me:$LINENO: error: +*** Version of libyui >= 2.15.12 needed (your version: $verstxt) +*** You can find it on: svn checkout http://svn.opensuse.org/svn/yast/trunk/core/ +*** Do "make -f Makefile.cvs" on root +*** Then you just need to compile stuff under libyui, +*** "cd libyui && make && sudo make install" +*** libyui broke compatibility in order to get away from YCP structures, +*** to make it easier for binding." >&5 +echo "$as_me: error: +*** Version of libyui >= 2.15.12 needed (your version: $verstxt) +*** You can find it on: svn checkout http://svn.opensuse.org/svn/yast/trunk/core/ +*** Do "make -f Makefile.cvs" on root +*** Then you just need to compile stuff under libyui, +*** "cd libyui && make && sudo make install" +*** libyui broke compatibility in order to get away from YCP structures, +*** to make it easier for binding." >&2;} + { (exit 1); exit 1; }; } +fi + ac_config_files="$ac_config_files Makefile src/Makefile" cat >confcache <<_ACEOF @@ -22971,6 +22965,5 @@ fi -echo " -Hello hacker: please read the README carefully while this builds. -" +echo "Hello hacker: checkout README while this builds." + Modified: trunk/gtk/unstable-libyui/configure.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/configure.in?... ============================================================================== --- trunk/gtk/unstable-libyui/configure.in (original) +++ trunk/gtk/unstable-libyui/configure.in Fri Dec 14 10:11:58 2007 @@ -180,19 +180,9 @@ fi AC_SUBST(PKG_CONFIG) - AC_FUNC_ALLOCA AC_HEADER_STDC -dnl Try to find the Zypp includes -AC_MSG_CHECKING([for zypp 3]) -if test -f /usr/include/zypp/SourceManager.h; then - AC_DEFINE(PRE_ZYPP_3, 1, [defined if using an older SL10.1 era zypp]) - AC_MSG_RESULT([pre 3]) -else - AC_MSG_RESULT([found]) -fi - PKG_CHECK_MODULES( ZYPP, libzypp ) AC_SUBST(ZYPP_LIBS) @@ -215,19 +205,22 @@ yast_vers=`echo "$verstxt" | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` AC_DEFINE_UNQUOTED(YAST2_VERSION, $yast_vers, [yast version for compile conditionals]) -dnl new UI library -AC_MSG_CHECKING([for old libyui]) PYUI_LIBS='-lpy2UI' -if test $yast_vers -le 2015006; then - PYUI_LIBS='-lyui' - AC_MSG_RESULT([found]) -else - AC_MSG_RESULT([use new lib]) -fi AC_SUBST(PYUI_LIBS) +dnl Checking for new libyui API... +if test $yast_vers -lt 2015012; then + AC_MSG_ERROR([ +*** Version of libyui >= 2.15.12 needed (your version: $verstxt) +*** You can find it on: svn checkout http://svn.opensuse.org/svn/yast/trunk/core/ +*** Do "make -f Makefile.cvs" on root +*** Then you just need to compile stuff under libyui, +*** "cd libyui && make && sudo make install" +*** libyui broke compatibility in order to get away from YCP structures, +*** to make it easier for binding.]) +fi + AC_OUTPUT([Makefile src/Makefile]) -echo " -Hello hacker: please read the README carefully while this builds. -" +echo "Hello hacker: checkout README while this builds." + -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org