Hello community, here is the log from the commit of package yast2-ldap for openSUSE:Factory checked in at 2013-08-01 11:08:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ldap (Old) and /work/SRC/openSUSE:Factory/.yast2-ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ldap" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ldap/yast2-ldap.changes 2013-02-01 16:16:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ldap.new/yast2-ldap.changes 2013-08-01 11:08:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 30 08:28:56 UTC 2013 - [email protected] + +- version 3.0.0 + +------------------------------------------------------------------- Old: ---- yast2-ldap-2.23.0.tar.bz2 New: ---- yast2-ldap-3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap.spec ++++++ --- /var/tmp/diff_new_pack.KhOikL/_old 2013-08-01 11:08:40.000000000 +0200 +++ /var/tmp/diff_new_pack.KhOikL/_new 2013-08-01 11:08:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ldap -Version: 2.23.0 +Version: 3.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ldap-2.23.0.tar.bz2 -> yast2-ldap-3.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/Makefile.am new/yast2-ldap-3.0.0/Makefile.am --- old/yast2-ldap-2.23.0/Makefile.am 2013-02-01 10:44:23.000000000 +0100 +++ new/yast2-ldap-3.0.0/Makefile.am 2013-07-31 11:37:50.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/Makefile.am.common new/yast2-ldap-3.0.0/Makefile.am.common --- old/yast2-ldap-2.23.0/Makefile.am.common 2013-02-01 10:44:22.000000000 +0100 +++ new/yast2-ldap-3.0.0/Makefile.am.common 2013-07-31 11:37:50.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/Makefile.in new/yast2-ldap-3.0.0/Makefile.in --- old/yast2-ldap-2.23.0/Makefile.in 2013-02-01 10:44:39.000000000 +0100 +++ new/yast2-ldap-3.0.0/Makefile.in 2013-07-31 11:38:04.000000000 +0200 @@ -69,7 +69,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -1061,19 +1061,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/VERSION new/yast2-ldap-3.0.0/VERSION --- old/yast2-ldap-2.23.0/VERSION 2013-02-01 10:44:15.000000000 +0100 +++ new/yast2-ldap-3.0.0/VERSION 2013-07-30 10:33:58.000000000 +0200 @@ -1 +1 @@ -2.23.0 +3.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/autodocs-cc-base.ami new/yast2-ldap-3.0.0/autodocs-cc-base.ami --- old/yast2-ldap-2.23.0/autodocs-cc-base.ami 2013-02-01 10:44:23.000000000 +0100 +++ new/yast2-ldap-3.0.0/autodocs-cc-base.ami 2013-07-31 11:37:50.000000000 +0200 @@ -15,7 +15,7 @@ AUTODOCS_CC ?= $(srcdir)/../../src AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h -html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @[email protected] +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png *.css *.js)) @[email protected] CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox doxygen.css @[email protected]: index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/conf/Makefile.in new/yast2-ldap-3.0.0/conf/Makefile.in --- old/yast2-ldap-2.23.0/conf/Makefile.in 2013-02-01 10:44:39.000000000 +0100 +++ new/yast2-ldap-3.0.0/conf/Makefile.in 2013-07-31 11:38:04.000000000 +0200 @@ -61,7 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/config.h.in new/yast2-ldap-3.0.0/config.h.in --- old/yast2-ldap-2.23.0/config.h.in 2013-02-01 10:44:38.000000000 +0100 +++ new/yast2-ldap-3.0.0/config.h.in 2013-07-31 11:38:03.000000000 +0200 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/configure new/yast2-ldap-3.0.0/configure --- old/yast2-ldap-2.23.0/configure 2013-02-01 10:44:38.000000000 +0100 +++ new/yast2-ldap-3.0.0/configure 2013-07-31 11:38:02.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-ldap 2.23.0. +# Generated by GNU Autoconf 2.69 for yast2-ldap 3.0.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap' PACKAGE_TARNAME='yast2-ldap' -PACKAGE_VERSION='2.23.0' -PACKAGE_STRING='yast2-ldap 2.23.0' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='yast2-ldap 3.0.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1372,7 +1372,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ldap 2.23.0 to adapt to many kinds of systems. +\`configure' configures yast2-ldap 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1443,7 +1443,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap 2.23.0:";; + short | recursive ) echo "Configuration of yast2-ldap 3.0.0:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap configure 2.23.0 +yast2-ldap configure 3.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2105,7 +2105,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ldap $as_me 2.23.0, which was +It was created by yast2-ldap $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3044,7 +3044,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap' - VERSION='2.23.0' + VERSION='3.0.0' cat >>confdefs.h <<_ACEOF @@ -3167,7 +3167,7 @@ -VERSION="2.23.0" +VERSION="3.0.0" RPMNAME="yast2-ldap" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -16670,7 +16670,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ldap $as_me 2.23.0, which was +This file was extended by yast2-ldap $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16736,7 +16736,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-ldap config.status 2.23.0 +yast2-ldap config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/configure.ac new/yast2-ldap-3.0.0/configure.ac --- old/yast2-ldap-2.23.0/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ldap-3.0.0/configure.ac 2013-07-31 11:37:50.000000000 +0200 @@ -0,0 +1,185 @@ +dnl configure.ac for yast2-ldap +dnl +dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl (edit configure.ac.in or configure.in.in instead) + +AC_INIT(yast2-ldap, 3.0.0, http://bugs.opensuse.org/, yast2-ldap) +dnl Check for presence of file 'RPMNAME' +AC_CONFIG_SRCDIR([RPMNAME]) + +dnl Checking host/target/build systems, for make, install etc. +AC_CANONICAL_TARGET +dnl Perform program name transformation +AC_ARG_PROGRAM + +AC_PREFIX_DEFAULT(/usr) + +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) + +dnl Important YaST2 variables +VERSION="3.0.0" +RPMNAME="yast2-ldap" +MAINTAINER="Jiri Suchomel <[email protected]>" + +dnl pkgconfig honors lib64 +pkgconfigdir=\${libdir}/pkgconfig +pkgconfigdatadir=\${datadir}/pkgconfig +yast2dir=\${prefix}/share/YaST2 + +ybindir=\${prefix}/lib/YaST2/bin +# FIXME duplicates execcompdir +ystartupdir=\${prefix}/lib/YaST2 +plugindir=\${libdir}/YaST2/plugin +includedir=\${prefix}/include/YaST2 +potdir=\${docdir}/pot + +docdir=\${prefix}/share/doc/packages/$RPMNAME +mandir=\${prefix}/share/man + +execcompdir=\${prefix}/lib/YaST2 +agentdir=${execcompdir}/servers_non_y2 + +ydatadir=${yast2dir}/data +imagedir=${yast2dir}/images +themedir=${yast2dir}/theme +localedir=${yast2dir}/locale +clientdir=${yast2dir}/clients +moduledir=${yast2dir}/modules +yncludedir=${yast2dir}/include +schemadir=${yast2dir}/schema +scrconfdir=${yast2dir}/scrconf +desktopdir=\${prefix}/share/applications/YaST2 + +AC_SUBST(VERSION) +AC_SUBST(RPMNAME) +AC_SUBST(MAINTAINER) + +AC_SUBST(pkgconfigdir) +AC_SUBST(pkgconfigdatadir) + +AC_SUBST(yast2dir) + +AC_SUBST(ybindir) +AC_SUBST(ystartupdir) +AC_SUBST(plugindir) +AC_SUBST(includedir) +AC_SUBST(potdir) +AC_SUBST(execcompdir) + +AC_SUBST(docdir) +AC_SUBST(mandir) + +AC_SUBST(ydatadir) +AC_SUBST(imagedir) +AC_SUBST(themedir) +AC_SUBST(localedir) +AC_SUBST(clientdir) +AC_SUBST(moduledir) +AC_SUBST(yncludedir) +AC_SUBST(schemadir) +AC_SUBST(scrconfdir) +AC_SUBST(agentdir) +AC_SUBST(desktopdir) + +fillupdir_d="/var/adm/fillup-templates" +AC_ARG_WITH(fillupdir, + AS_HELP_STRING([--with-fillupdir=DIR], + [where to place fillup templates (default $fillupdir_d.]), + [ fillupdir="$withval" ], + [ fillupdir="$fillupdir_d" ]) +AC_SUBST(fillupdir) + +dnl Automake 1.11 enables silent compilation, +dnl Disable it by "configure --disable-silent-rules" or "make V=1" +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl Checks for programs. +AC_PROG_INSTALL +dnl The YCP interpreter checks whether dependent ybc files are older +dnl so we must preserve their timestamps +INSTALL="${INSTALL} -p" +AC_PROG_LN_S +AC_PROG_MAKE_SET + +dnl pkgconfig +AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) +dnl devtools +dnl ... + +dnl no need for AC_ARG_VAR +AC_PATH_PROG(XGETTEXT, xgettext) +if test -z "$XGETTEXT" ; then + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) +fi + +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` + +dnl producing pkg-config for others? +AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) +AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) + +dbdir=${devtools_yast2dir}/data/docbook +STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl +STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl +STYLESHEET_CSS=${dbdir}/css/yast2docs.css +STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl +STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl +AC_SUBST(STYLESHEET_HTML) +AC_SUBST(STYLESHEET_PDF) +AC_SUBST(STYLESHEET_CSS) +AC_SUBST(STYLESHEET_YDOC) +AC_SUBST(STYLESHEET_YCPDOC) + + + +AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) +if test "$YDOXYGEN" = "false"; then + AC_MSG_ERROR([ydoxygen is not installed]) +fi + +AC_PROG_CXX +AC_PROG_AWK +AC_PROG_CC +AC_PROG_CPP + +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already +PKG_CHECK_EXISTS([yast2-core],[ + PKG_CHECK_MODULES(Y2CORE, yast2-core) +]) + +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" + +: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'} +AC_SUBST(AGENT_LIBADD) + +AC_DISABLE_STATIC +AC_PROG_LIBTOOL +AM_PROG_LIBTOOL dnl for libraries + +dnl generate the config header +AC_CONFIG_HEADERS([config.h]) dnl at the distribution this done + +AC_FUNC_ALLOCA +AC_HEADER_STDC + + +AC_LANG_PUSH(C++) +yast_found_ldapcpplib=no +AC_CHECK_HEADER(LDAPSchema.h,[yast_found_ldapcpplib=yes]) +if [[ "$yast_found_ldapcpplib" = "no" ]]; then + AC_MSG_ERROR(Headers for ldapcpp are missing. Please install the package libldapcpp-devel.) +fi +AC_LANG_POP(C++) + +AC_CONFIG_FILES(Makefile conf/Makefile +doc/autodocs/Makefile +doc/Makefile +src/Makefile) +AC_OUTPUT + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/configure.in new/yast2-ldap-3.0.0/configure.in --- old/yast2-ldap-2.23.0/configure.in 2013-02-01 10:44:22.000000000 +0100 +++ new/yast2-ldap-3.0.0/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,185 +0,0 @@ -dnl configure.in for yast2-ldap -dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- -dnl (edit configure.in.in instead) - -AC_INIT(yast2-ldap, 2.23.0, http://bugs.opensuse.org/, yast2-ldap) -dnl Check for presence of file 'RPMNAME' -AC_CONFIG_SRCDIR([RPMNAME]) - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_TARGET -dnl Perform program name transformation -AC_ARG_PROGRAM - -AC_PREFIX_DEFAULT(/usr) - -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) - -dnl Important YaST2 variables -VERSION="2.23.0" -RPMNAME="yast2-ldap" -MAINTAINER="Jiri Suchomel <[email protected]>" - -dnl pkgconfig honors lib64 -pkgconfigdir=\${libdir}/pkgconfig -pkgconfigdatadir=\${datadir}/pkgconfig -yast2dir=\${prefix}/share/YaST2 - -ybindir=\${prefix}/lib/YaST2/bin -# FIXME duplicates execcompdir -ystartupdir=\${prefix}/lib/YaST2 -plugindir=\${libdir}/YaST2/plugin -includedir=\${prefix}/include/YaST2 -potdir=\${docdir}/pot - -docdir=\${prefix}/share/doc/packages/$RPMNAME -mandir=\${prefix}/share/man - -execcompdir=\${prefix}/lib/YaST2 -agentdir=${execcompdir}/servers_non_y2 - -ydatadir=${yast2dir}/data -imagedir=${yast2dir}/images -themedir=${yast2dir}/theme -localedir=${yast2dir}/locale -clientdir=${yast2dir}/clients -moduledir=${yast2dir}/modules -yncludedir=${yast2dir}/include -schemadir=${yast2dir}/schema -scrconfdir=${yast2dir}/scrconf -desktopdir=\${prefix}/share/applications/YaST2 - -AC_SUBST(VERSION) -AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) - -AC_SUBST(pkgconfigdir) -AC_SUBST(pkgconfigdatadir) - -AC_SUBST(yast2dir) - -AC_SUBST(ybindir) -AC_SUBST(ystartupdir) -AC_SUBST(plugindir) -AC_SUBST(includedir) -AC_SUBST(potdir) -AC_SUBST(execcompdir) - -AC_SUBST(docdir) -AC_SUBST(mandir) - -AC_SUBST(ydatadir) -AC_SUBST(imagedir) -AC_SUBST(themedir) -AC_SUBST(localedir) -AC_SUBST(clientdir) -AC_SUBST(moduledir) -AC_SUBST(yncludedir) -AC_SUBST(schemadir) -AC_SUBST(scrconfdir) -AC_SUBST(agentdir) -AC_SUBST(desktopdir) - -fillupdir_d="/var/adm/fillup-templates" -AC_ARG_WITH(fillupdir, - AS_HELP_STRING([--with-fillupdir=DIR], - [where to place fillup templates (default $fillupdir_d.]), - [ fillupdir="$withval" ], - [ fillupdir="$fillupdir_d" ]) -AC_SUBST(fillupdir) - -dnl Automake 1.11 enables silent compilation, -dnl Disable it by "configure --disable-silent-rules" or "make V=1" -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -dnl Checks for programs. -AC_PROG_INSTALL -dnl The YCP interpreter checks whether dependent ybc files are older -dnl so we must preserve their timestamps -INSTALL="${INSTALL} -p" -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl pkgconfig -AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) -dnl devtools -dnl ... - -dnl no need for AC_ARG_VAR -AC_PATH_PROG(XGETTEXT, xgettext) -if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) -fi - -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` - -dnl producing pkg-config for others? -AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) -AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) - -dbdir=${devtools_yast2dir}/data/docbook -STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl -STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl -STYLESHEET_CSS=${dbdir}/css/yast2docs.css -STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl -STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl -AC_SUBST(STYLESHEET_HTML) -AC_SUBST(STYLESHEET_PDF) -AC_SUBST(STYLESHEET_CSS) -AC_SUBST(STYLESHEET_YDOC) -AC_SUBST(STYLESHEET_YCPDOC) - - - -AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) -if test "$YDOXYGEN" = "false"; then - AC_MSG_ERROR([ydoxygen is not installed]) -fi - -AC_PROG_CXX -AC_PROG_AWK -AC_PROG_CC -AC_PROG_CPP - -# If we have core, get its Y2CORE_CFLAGS. -# When building core itself, it has set Y2CORE_CFLAGS elsewhere already -PKG_CHECK_EXISTS([yast2-core],[ - PKG_CHECK_MODULES(Y2CORE, yast2-core) -]) - -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" - -: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'} -AC_SUBST(AGENT_LIBADD) - -AC_DISABLE_STATIC -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL dnl for libraries - -dnl generate the config header -AC_CONFIG_HEADERS([config.h]) dnl at the distribution this done - -AC_FUNC_ALLOCA -AC_HEADER_STDC - - -AC_LANG_PUSH(C++) -yast_found_ldapcpplib=no -AC_CHECK_HEADER(LDAPSchema.h,[yast_found_ldapcpplib=yes]) -if [[ "$yast_found_ldapcpplib" = "no" ]]; then - AC_MSG_ERROR(Headers for ldapcpp are missing. Please install the package libldapcpp-devel.) -fi -AC_LANG_POP(C++) - -AC_CONFIG_FILES(Makefile conf/Makefile -doc/autodocs/Makefile -doc/Makefile -src/Makefile) -AC_OUTPUT - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/doc/Makefile.in new/yast2-ldap-3.0.0/doc/Makefile.in --- old/yast2-ldap-2.23.0/doc/Makefile.in 2013-02-01 10:44:39.000000000 +0100 +++ new/yast2-ldap-3.0.0/doc/Makefile.in 2013-07-31 11:38:04.000000000 +0200 @@ -61,7 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/doc/autodocs/Makefile.in new/yast2-ldap-3.0.0/doc/autodocs/Makefile.in --- old/yast2-ldap-2.23.0/doc/autodocs/Makefile.in 2013-02-01 10:44:39.000000000 +0100 +++ new/yast2-ldap-3.0.0/doc/autodocs/Makefile.in 2013-07-31 11:38:04.000000000 +0200 @@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -296,7 +296,7 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @[email protected] +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png *.css *.js)) @[email protected] CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox html_DATA = $(html_data) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-2.23.0/src/Makefile.in new/yast2-ldap-3.0.0/src/Makefile.in --- old/yast2-ldap-2.23.0/src/Makefile.in 2013-02-01 10:44:40.000000000 +0100 +++ new/yast2-ldap-3.0.0/src/Makefile.in 2013-07-31 11:38:04.000000000 +0200 @@ -66,7 +66,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -776,7 +776,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
