[KBear-cvs] kbear/admin Doxyfile.am,1.4,1.5 Doxyfile.global,1.3,1.4 Makefile.common,1.13,1.14 acincl
Brought to you by:
kbjorn
Menu
▾
▴
[KBear-cvs] kbear/admin Doxyfile.am,1.4,1.5 Doxyfile.global,1.3,1.4 Makefile.common,1.13,1.14 acinclude.m4.in,1.19,1.20 am_edit,1.18,1.19 bcheck.pl,1.1,1.2 compile,1.1,1.2 conf.change.pl,1.5,1.6 config.guess,1.7,1.8 config.pl,1.5,1.6 config.sub,1.7,1.8 configure.in.bot.end,1.2,1.3 configure.in.min,1.3,1.4 cvs.sh,1.6,1.7 depcomp,1.4,1.5 install-sh,1.4,1.5 libtool.m4.in,1.9,1.10 ltmain.sh,1.9,1.10 missing,1.5,1.6 mkinstalldirs,1.14,1.15 oldinclude.m4.in,1.1,1.2 ylwrap,1.3,1.4
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16289/admin Modified Files: Doxyfile.am Doxyfile.global Makefile.common acinclude.m4.in am_edit bcheck.pl compile conf.change.pl config.guess config.pl config.sub configure.in.bot.end configure.in.min cvs.sh depcomp install-sh libtool.m4.in ltmain.sh missing mkinstalldirs oldinclude.m4.in ylwrap Log Message: Index: Doxyfile.am =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Doxyfile.am 12 Apr 2005 13:06:43 -0000 1.4 --- Doxyfile.am 23 Oct 2005 20:52:20 -0000 1.5 *************** *** 1,69 **** ## generate API documentation with doxygen apidox-am-yes: @if test "$(subdir)" != "."; then \ ! $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\ ! if test ! -x $(top_builddir)/apidocs/common; then \ ! if test -d $(top_srcdir)/doc/common; then \ ! common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\ ! else \ ! common_dir=$(kde_libs_htmldir)/en/common ;\ ! fi ;\ ! $(LN_S) $$common_dir $(top_builddir)/apidocs/common; \ ! fi ;\ ! cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(subdir) Library\"" >> Doxyfile; \ ! echo "PROJECT_NUMBER = \"Version $(VERSION)\"" >> Doxyfile; \ ! echo "INPUT = $(srcdir)" >> Doxyfile; \ ! echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\ ! echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \ ! echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \ ! echo "HTML_HEADER = $(top_builddir)/apidocs/common/header.html" >> Doxyfile;\ ! echo "HTML_FOOTER = $(top_builddir)/apidocs/common/footer.html" >> Doxyfile;\ ! echo "HTML_STYLESHEET = $(top_builddir)/apidocs/common/doxygen.css" >> Doxyfile;\ ! echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \ ! echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \ ! echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \ ! echo "GENERATE_HTML = $(GENERATE_FLAG)" >> Doxyfile ;\ ! echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\ ! echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ ! if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! patterns= ;\ ! dirs= ;\ ! for item in `echo "$(DOXYGEN_EXCLUDE)"`; do \ ! if test -d "$(srcdir)/$$item"; then \ ! dirs="$$dirs $(srcdir)/$$item/" ;\ ! else \ ! patterns="$$patterns $$item" ;\ ! fi ;\ ! done ;\ ! echo "EXCLUDE_PATTERNS += $$patterns" >> Doxyfile; \ ! echo "EXCLUDE += $$dirs" >> Doxyfile ;\ ! fi ;\ ! echo "TAGFILES = \\" >> Doxyfile; \ ! tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \ ! tagpath= ;\ ! path="../../$$tag" ;\ ! if test -f $(top_builddir)/apidocs/$$tag/$$tag.tag; then \ ! tagpath="$(top_builddir)/apidocs/$$tag/$$tag.tag" ;\ ! else \ ! tagpath=`ls -1 $(kde_htmldir)/en/*-apidocs/$$tag/$$tag.tag 2> /dev/null` ;\ ! if test -n "$$tagpath"; then \ ! path=`echo $$tagpath | sed -e "s,.*/\([^/]*-apidocs\)/$$tag/$$tag.tag,../../../\1/$$tag,"` ;\ ! fi ;\ ! fi ;\ ! if test "$$tag" = qt; then \ ! echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\ ! else if test -n "$$tagpath"; then \ ! echo "$$tagpath=$$path/html \\" >> Doxyfile ;\ ! fi ;\ ! fi ;\ ! done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\ ! echo "IGNORE_PREFIX = K" >> Doxyfile ;\ ! echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ ! $(DOXYGEN) Doxyfile ;\ fi ! apidox-am-no: install-data-local: install-apidox --- 1,37 ---- ## generate API documentation with doxygen apidox-am-yes: + @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \ + export DOXDATA=$(kde_libs_htmldir)/en/common ; \ + fi ; \ + test -d $(top_builddir)/apidocs || \ + ( cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --no-modulename --installdir=$(kde_libs_htmldir)/en \ + --no-recurse $(top_srcdir) . ) ; \ + cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \ + $(top_srcdir) $(subdir) + + apidox-am-toplevel-yes: + @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \ + export DOXDATA=$(kde_libs_htmldir)/en/common ; \ + fi ; \ + cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --no-modulename --installdir=$(kde_libs_htmldir)/en \ + $(top_srcdir) + + ## Don't generate API documentation without doxygen + apidox-am-no: + + apidox-am-toplevel-no: + + + apidox: @if test "$(subdir)" != "."; then \ ! $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\ ! else \ ! $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\ fi ! install-data-local: install-apidox *************** *** 84,93 **** done; \ fi; \ - symlink="$(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ - if test ! -L "$symlink" -o `readlink "$symlink" 2>/dev/null` != "$(kde_libs_htmldir)/en/common"; then \ - echo "Creating symlink $(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ - rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ - $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ - fi; \ else\ if test -d $(top_builddir)/apidocs; then \ --- 52,55 ---- *************** *** 95,98 **** --- 57,61 ---- list=`cd $(top_builddir)/apidocs && ls -1`; \ echo "installing $(top_builddir)/apidocs/$$file" ;\ + echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \ for file in $$list; do \ if test -f $(top_builddir)/apidocs/$$file; then \ *************** *** 116,178 **** fi ! apidox: ! @if test "$(subdir)" != "."; then \ ! $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\ ! else \ ! $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\ ! fi @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; \ for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \ ! echo "Making apidox in $$subdir"; \ ! if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no apidox) || exit 1; \ ! fi ; fi ;\ ! done; \ ! for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \ ! echo "Making apidox in $$subdir"; \ if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=yes apidox) || exit 1; \ fi ; fi ;\ done; \ fi ! apidox-am-toplevel-no: ! apidox-am-toplevel-yes: ! @echo "*** Creating API documentation main page"; \ ! cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \ ! echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ ! echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ ! echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \ ! echo "RECURSIVE = NO" >> Doxyfile ; \ ! echo "SOURCE_BROWSER = NO" >> Doxyfile ; \ ! echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \ ! echo "HTML_OUTPUT = ." >> Doxyfile ; \ ! echo "HTML_HEADER = apidocs/common/mainheader.html" >> Doxyfile ; \ ! echo "HTML_FOOTER = apidocs/common/mainfooter.html" >> Doxyfile ; \ ! echo "HTML_STYLESHEET = apidocs/common/doxygen.css" >> Doxyfile ; \ ! echo "GENERATE_LATEX = NO" >> Doxyfile ; \ ! echo "GENERATE_RTF = NO" >> Doxyfile ; \ ! echo "GENERATE_MAN = NO" >> Doxyfile ; \ ! echo "GENERATE_XML = NO" >> Doxyfile ; \ ! echo "GENERATE_AUTOGEN_DEF = NO" >> Doxyfile ; \ ! echo "ENABLE_PREPROCESSING = NO" >> Doxyfile ; \ ! echo "CLASS_DIAGRAMS = NO" >> Doxyfile ; \ ! echo "HAVE_DOT = NO" >> Doxyfile ; \ ! echo "GENERATE_HTML = YES" >> Doxyfile ;\ ! $(mkinstalldirs) $(top_builddir)/apidocs ; \ ! rm -f $(top_builddir)/apidocs/common ; \ ! if test -d $(top_srcdir)/doc/common; then \ ! common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\ ! else \ ! common_dir=$(kde_libs_htmldir)/en/common ;\ ! fi ;\ ! $(LN_S) $$common_dir $(top_builddir)/apidocs/common ;\ ! doxygen Doxyfile; \ ! rm -f Doxyfile .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes --- 79,95 ---- fi ! install-apidox-recurse: install-apidox @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; \ for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \ ! echo "Installing apidox from $$subdir"; \ if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \ fi ; fi ;\ done; \ fi ! .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes Index: Doxyfile.global =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.global,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Doxyfile.global 12 Apr 2005 13:06:44 -0000 1.3 --- Doxyfile.global 23 Oct 2005 20:52:20 -0000 1.4 *************** *** 1,404 **** - # Doxyfile 1.3.6 - - # This file describes the settings to be used by the documentation system - # doxygen (www.doxygen.org) for a project - # - # All text after a hash (#) is considered a comment and will be ignored - # The format is: - # TAG = value [value, ...] - # For lists items can also be appended using: - # TAG += value [value, ...] [...1231 lines suppressed...] ! HTML_ALIGN_MEMBERS = YES ! REFERENCED_BY_RELATION = NO ! REFERENCES_RELATION = NO ! VERBATIM_HEADERS = NO ! GENERATE_HTML = YES ! SOURCE_BROWSER = YES ! GENERATE_AUTOGEN_DEF = NO ! DETAILS_AT_TOP = YES ! SORT_MEMBER_DOCS = YES ! GENERATE_TODOLIST = YES ! IGNORE_PREFIX = K ! GENERATE_HTML = YES ! CLASS_GRAPH = YES ! COLLABORATION_GRAPH = NO ! MACRO_EXPANSION = YES ! EXPAND_ONLY_PREDEF = YES Index: Makefile.common =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Makefile.common,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.common 12 Apr 2005 13:06:44 -0000 1.13 --- Makefile.common 23 Oct 2005 20:52:20 -0000 1.14 *************** *** 7,11 **** SHELL=/bin/sh ! cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ --- 7,11 ---- SHELL=/bin/sh ! cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ *************** *** 31,35 **** configure.files: subdirs .SILENT: ! .PHONY: cvs dist cvs-clean package-merge package-messages --- 31,37 ---- configure.files: subdirs + svn: cvs + .SILENT: ! .PHONY: svn cvs dist package-merge package-messages Index: acinclude.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/admin/acinclude.m4.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** acinclude.m4.in 12 Apr 2005 13:06:44 -0000 1.19 --- acinclude.m4.in 23 Oct 2005 20:52:20 -0000 1.20 *************** *** 17,22 **** dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! dnl Boston, MA 02111-1307, USA. dnl IMPORTANT NOTE: --- 17,22 ---- dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! dnl Boston, MA 02110-1301, USA. dnl IMPORTANT NOTE: *************** *** 594,597 **** --- 594,602 ---- kde33ornewer= fi + if test "$KDECONFIG" != "compiled"; then + if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then + kde33ornewer= + fi + fi fi fi *************** *** 607,611 **** KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) ! if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" --- 612,616 ---- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) ! if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" *************** *** 804,807 **** --- 809,813 ---- KDE_CHECK_LIBDL KDE_CHECK_STRLCPY + KDE_CHECK_PIE_SUPPORT # darwin needs this to initialize the environment *************** *** 1175,1187 **** if test $kde_qtsubver -gt 1; then if test $kde_qtsubver -gt 2; then ! kde_qt_minversion=">= Qt 3.3" else ! kde_qt_minversion=">= Qt 3.2" fi else ! kde_qt_minversion=">= Qt 3.1 (20021021)" fi else ! kde_qt_minversion=">= Qt 3.0" fi fi --- 1181,1193 ---- if test $kde_qtsubver -gt 1; then if test $kde_qtsubver -gt 2; then ! kde_qt_minversion=">= Qt 3.3 and < 4.0" else ! kde_qt_minversion=">= Qt 3.2 and < 4.0" fi else ! kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" fi else ! kde_qt_minversion=">= Qt 3.0 and < 4.0" fi fi *************** *** 1217,1220 **** --- 1223,1229 ---- fi + if test $kde_qtver = 4; then + kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" + fi if test $kde_qtver = 3; then kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" *************** *** 1348,1367 **** fi - if test -z "$LIBQT"; then dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the Qt library name. dnl ------------------------------------------------------------ ! if test "x$kde_use_qt_emb" = "xyes"; then ! qtlib="qte" ! else ! qtlib="qt" ! fi ! ! kde_int_qt="-l$qtlib" else ! kde_int_qt="$LIBQT" ! kde_lib_qt_set=yes fi if test -z "$LIBQPE"; then dnl ------------------------------------------------------------ --- 1357,1371 ---- fi dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the Qt library name. dnl ------------------------------------------------------------ ! if test "x$kde_use_qt_emb" = "xyes"; then ! qtlib="qte" else ! qtlib="qt" fi + kde_int_qt="-l$qtlib" + if test -z "$LIBQPE"; then dnl ------------------------------------------------------------ *************** *** 1384,1394 **** if test "x$kde_use_qt_mt" = "xyes"; then ! if test -z "$LIBQT"; then ! LIBQT="-l$qtlib-mt" ! kde_int_qt="-l$qtlib-mt" ! else ! LIBQT="$qtlib-mt" ! kde_int_qt="$qtlib-mt" ! fi LIBQT_GLOB="lib$qtlib-mt.*" USING_QT_MT="using -mt" --- 1388,1393 ---- if test "x$kde_use_qt_mt" = "xyes"; then ! LIBQT="-l$qtlib-mt" ! kde_int_qt="-l$qtlib-mt" LIBQT_GLOB="lib$qtlib-mt.*" USING_QT_MT="using -mt" *************** *** 1650,1655 **** If you did install kdelibs, then the Qt version that is picked up by this configure is not the same version you used to compile kdelibs. ! The Qt Plugin installed by kdelibs is *ONLY* loadable if its the ! same Qt version, compiled with the same compiler and the same Qt configuration settings. ]) --- 1649,1654 ---- If you did install kdelibs, then the Qt version that is picked up by this configure is not the same version you used to compile kdelibs. ! The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the ! _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) *************** *** 2065,2068 **** --- 2064,2072 ---- if test $kde_qtver = 3; then + case $host in + *cygwin*) lib_kded="-lkdeinit_kded" ;; + *) lib_kded="" ;; + esac + AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDEUI, "-lkdeui") *************** *** 2081,2084 **** --- 2085,2089 ---- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") + AC_SUBST(LIB_KUNITTEST, "-lkunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") *************** *** 2499,2518 **** CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( ! [/* Override any gcc2 internal prototype to avoid an error. */ ! struct jpeg_decompress_struct; ! typedef struct jpeg_decompress_struct * j_decompress_ptr; ! typedef int size_t; #ifdef __cplusplus extern "C" { #endif ! void jpeg_CreateDecompress(j_decompress_ptr cinfo, ! int version, size_t structsize); #ifdef __cplusplus } #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ ], ! [jpeg_CreateDecompress(0L, 0, 0);], eval "ac_cv_lib_jpeg_$1=-ljpeg$2", eval "ac_cv_lib_jpeg_$1=no") --- 2504,2517 ---- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( ! [ #ifdef __cplusplus extern "C" { #endif ! void jpeg_CreateDecompress(); #ifdef __cplusplus } #endif ], ! [jpeg_CreateDecompress();], eval "ac_cv_lib_jpeg_$1=-ljpeg$2", eval "ac_cv_lib_jpeg_$1=no") *************** *** 2721,2724 **** --- 2720,2790 ---- ]) + AC_DEFUN([KDE_FIND_LIBEXR], + [ + AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + AC_REQUIRE([AC_FIND_ZLIB]) + AC_CACHE_VAL(ac_cv_libexr, + [ + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + AC_MSG_CHECKING([for OpenEXR libraries]) + + if test "$PKG_CONFIG" = "no" ; then + AC_MSG_RESULT(no) + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + if !(`$PKG_CONFIG --exists OpenEXR`) ; then + AC_MSG_RESULT(no) + EXRSTATUS=no + else + if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then + AC_MSG_RESULT(no) + EXRSTATUS=old + else + kde_save_LIBS="$LIBS" + LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + kde_save_CXXFLAGS="$CXXFLAGS" + EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` + CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" + + AC_TRY_LINK(dnl + [ + #include <ImfRgbaFile.h> + ], + [ + using namespace Imf; + RgbaInputFile file ("dummy"); + return 0; + ], + eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", + eval "ac_cv_libexr=no" + ) + LIBS="$kde_save_LIBS" + CXXFLAGS="$kde_save_CXXFLAGS" + AC_LANG_RESTORE + ])dnl + if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then + AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) + LIB_EXR="$ac_cv_libexr" + AC_MSG_RESULT($ac_cv_libexr) + else + AC_MSG_RESULT(no) + LIB_EXR="" + fi + fi + fi + fi + AC_SUBST(LIB_EXR) + AC_SUBST(EXR_FLAGS) + ]) + + AC_DEFUN([AC_FIND_PNG], *************** *** 2909,2912 **** --- 2975,3019 ---- ]) + + AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], + [ + AC_MSG_CHECKING([whether $CC is blacklisted]) + + dnl In theory we have tu run this test against $CC and $CXX + dnl in C and in C++ mode, because its perfectly legal for + dnl the user to mix compiler versions, since C has a defined + dnl ABI. + dnl + dnl For now, we assume the user is not on crack. + + AC_TRY_COMPILE([ + #ifdef __GNUC__ + #if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 + choke me + #endif + #endif + ], , + kde_bad_compiler=no, + kde_bad_compiler=yes + ) + + AC_MSG_RESULT($kde_bad_compiler) + + if test "$kde_bad_compiler" = "yes"; then + AC_MSG_ERROR([ + + This particular compiler version is blacklisted because it + is known to miscompile KDE. Please use a newer version, or + if that is not yet available, choose an older version. + + Please do not report a bug or bother us reporting this + configure error. We know about it, and we introduced + it by intention to avoid untraceable bugs or crashes in KDE. + + ]) + fi + + ]) + dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given AC_DEFUN([AC_VALIDIFY_CXXFLAGS], *************** *** 3018,3021 **** --- 3125,3130 ---- AC_PROG_CXX + KDE_CHECK_FOR_BAD_COMPILER + if test "$GXX" = "yes" || test "$CXX" = "KCC"; then if test "$kde_use_debug_code" != "no"; then *************** *** 3057,3061 **** if test "$kde_use_warnings" = "yes"; then if test "$GCC" = "yes"; then ! CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" case $host in *-*-linux-gnu) --- 3166,3170 ---- if test "$kde_use_warnings" = "yes"; then if test "$GCC" = "yes"; then ! CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" case $host in *-*-linux-gnu) *************** *** 3068,3072 **** KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) ! KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"]) fi fi --- 3177,3182 ---- KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) ! dnl ### FIXME: revert for KDE 4 ! KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) fi fi *************** *** 3218,3234 **** [ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ ! template<typename CharT> ! struct VisTest ! { ! inline VisTest (); ! }; ! template<typename CharT> ! inline VisTest<CharT>::VisTest() ! {} ! extern template class VisTest<char>; // It works if we drop that line ! int some_function( int do_something ) __attribute__ ((visibility("default"))); ! int some_function( int ) { ! VisTest<char> a; return 0; } --- 3328,3336 ---- [ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ ! #include <string> ! int some_function( void ) __attribute__ ((visibility("default"))); ! int some_function( void ) { ! std::string s("blafasel"); return 0; } *************** *** 3248,3270 **** ) ! AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY], [ ! if test "$GXX" = "yes" && test "$kde_use_debug_code" = "no"; then KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, [ CXXFLAGS="$CXXFLAGS -fvisibility=hidden" KDE_CHECK_VISIBILITY_GCC_BUG - HAVE_GCC_VISIBILITY=1 AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) ]) fi ]) - AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], - [ - AC_REQUIRE([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY]) - ]) - AC_DEFUN([KDE_ADD_DEPENDENCIES], [ --- 3350,3395 ---- ) ! AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], [ ! AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) ! ! if test "x$GXX" = "xyes"; then ! kde_have_gcc_visibility=no KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, [ + kde_have_gcc_visibility=yes + AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + safe_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $all_includes" + + AC_TRY_COMPILE( + [ + #include <qglobal.h> + #if Q_EXPORT - 0 != 0 + /* if this compiles, then Q_EXPORT is undefined */ + /* if Q_EXPORT is nonempty, this will break compilation */ + #endif + ], [/* elvis is alive */], + kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) + + CXXFLAGS=$safe_CXXFLAGS + AC_LANG_RESTORE + ] + ) + + if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then CXXFLAGS="$CXXFLAGS -fvisibility=hidden" KDE_CHECK_VISIBILITY_GCC_BUG HAVE_GCC_VISIBILITY=1 AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) + fi ]) fi ]) AC_DEFUN([KDE_ADD_DEPENDENCIES], [ *************** *** 3294,3297 **** --- 3419,3426 ---- AC_SUBST(KDE_PLUGIN) + # This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. + KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" + AC_SUBST(KDE_CHECK_PLUGIN) + # we patch configure quite some so we better keep that consistent for incremental runs AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') *************** *** 3722,3726 **** ac_save_cflags="$CFLAGS" ac_save_libs="$LIBS" ! LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET" CFLAGS="$CFLAGS $X_INCLUDES" test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" --- 3851,3856 ---- ac_save_cflags="$CFLAGS" ac_save_libs="$LIBS" ! LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" ! LIBS="-lX11 -lXext $LIBSOCKET" CFLAGS="$CFLAGS $X_INCLUDES" test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" *************** *** 3733,3742 **** { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], ac_cv_have_dpms="yes", [ ! LDFLAGS="$ac_save_ldflags" ! CFLAGS="$ac_save_cflags" ! LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET" ! LIBS="$LIBS -lXdpms" ! CFLAGS="$CFLAGS $X_INCLUDES" ! test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" AC_TRY_LINK([ #include <X11/Xproto.h> --- 3863,3867 ---- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], ac_cv_have_dpms="yes", [ ! LIBS="-lXdpms $LIBS" AC_TRY_LINK([ #include <X11/Xproto.h> *************** *** 3787,3796 **** AC_CHECK_DECL(DPMSCapable, AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, ! [#include <X11/extensions/dpms.h>]) AH_TEMPLATE(HAVE_DPMSINFO_PROTO, [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) AC_CHECK_DECL(DPMSInfo, AC_DEFINE(HAVE_DPMSINFO_PROTO),, ! [#include <X11/extensions/dpms.h>]) CFLAGS="$ac_save_cflags" AC_SUBST(DPMSINC) --- 3912,3923 ---- AC_CHECK_DECL(DPMSCapable, AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, ! [#include <X11/Xlib.h> ! #include <X11/extensions/dpms.h>]) AH_TEMPLATE(HAVE_DPMSINFO_PROTO, [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) AC_CHECK_DECL(DPMSInfo, AC_DEFINE(HAVE_DPMSINFO_PROTO),, ! [#include <X11/Xlib.h> ! #include <X11/extensions/dpms.h>]) CFLAGS="$ac_save_cflags" AC_SUBST(DPMSINC) *************** *** 3818,3826 **** AC_LANG_SAVE AC_LANG_CPLUSPLUS ! ac_save_ldflags="$LDFLAGS" ! ac_save_cxxflags="$CXXFLAGS" ! LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU" ! test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11" ! LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET" CXXFLAGS="$CFLAGS $X_INCLUDES" test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" --- 3945,3955 ---- AC_LANG_SAVE AC_LANG_CPLUSPLUS ! ac_save_ldflags=$LDFLAGS ! ac_save_cxxflags=$CXXFLAGS ! ac_save_libs=$LIBS ! LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" ! LIBS="$LIBS -lGL -lGLU" ! test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" ! LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" CXXFLAGS="$CFLAGS $X_INCLUDES" test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" *************** *** 3830,3835 **** ac_cv_have_gl="yes", ac_cv_have_gl="no") AC_LANG_RESTORE ! LDFLAGS="$ac_save_ldflags" ! CXXFLAGS="$ac_save_cxxflags" ])dnl --- 3959,3965 ---- ac_cv_have_gl="yes", ac_cv_have_gl="no") AC_LANG_RESTORE ! LDFLAGS=$ac_save_ldflags ! CXXFLAGS=$ac_save_cxxflags ! LIBS=$ac_save_libs ])dnl *************** *** 5714,5715 **** --- 5844,5889 ---- ]) + + dnl Check for PIE support in the compiler and linker + AC_DEFUN([KDE_CHECK_PIE_SUPPORT], + [ + AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + safe_CXXFLAGS=$CXXFLAGS + safe_LDFLAGS=$LDFLAGS + CXXFLAGS="$CXXFLAGS -fpie" + LDFLAGS="$LDFLAGS -pie" + + AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) + + CXXFLAGS=$safe_CXXFLAGS + LDFLAGS=$safe_LDFLAGS + AC_LANG_RESTORE + ]) + + AC_MSG_CHECKING(if enabling -pie/fpie support) + + AC_ARG_ENABLE(pie, + AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), + [kde_has_pie_support=$enableval], + [kde_has_pie_support=detect]) + + if test "$kde_has_pie_support" = "detect"; then + kde_has_pie_support=$kde_cv_val_pie_support + fi + + AC_MSG_RESULT([$kde_has_pie_support]) + + KDE_USE_FPIE="" + KDE_USE_PIE="" + + AC_SUBST([KDE_USE_FPIE]) + AC_SUBST([KDE_USE_PIE]) + + if test "$kde_has_pie_support" = "yes"; then + KDE_USE_FPIE="-fpie" + KDE_USE_PIE="-pie" + fi + ]) Index: am_edit =================================================================== RCS file: /cvsroot/kbear/kbear/admin/am_edit,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** am_edit 12 Apr 2005 13:06:44 -0000 1.18 --- am_edit 23 Oct 2005 20:52:20 -0000 1.19 *************** *** 423,430 **** } - my $cvs_lines = "cvs-clean:\n"; - $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n"; - appendLines($cvs_lines); - $cvs_lines = "kde-rpo-clean:\n"; $cvs_lines .= "\t-rm -f *.rpo\n"; --- 423,426 ---- *************** *** 877,882 **** $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n"; ! $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n"; ! $lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n"; push(@cleanfiles, "${kdeinit}.la.$cxxsuffix"); --- 873,879 ---- $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n"; ! $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n"; ! $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n"; ! $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n"; push(@cleanfiles, "${kdeinit}.la.$cxxsuffix"); *************** *** 1378,1383 **** $dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "\trm -rf $source.h;\n"; ! $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; ! $dep_lines .= "$source.moc: $source.h\n"; $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n"; --- 1375,1383 ---- $dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "\trm -rf $source.h;\n"; ! if (!$kdeopts{"qtonly"}) { ! $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; ! } else { ! $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; ! } $dep_lines .= "$source.moc: $source.h\n"; $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n"; Index: bcheck.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/bcheck.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bcheck.pl 12 Apr 2005 13:06:44 -0000 1.1 --- bcheck.pl 23 Oct 2005 20:52:21 -0000 1.2 *************** *** 119,122 **** --- 119,123 ---- s/0x[0-9a-fA-F]+/0x......../g; s/base size=/size=/g; + s/\(\)\s*$//g; s/base align=/align=/g; Index: compile =================================================================== RCS file: /cvsroot/kbear/kbear/admin/compile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** compile 8 Oct 2002 18:12:24 -0000 1.1 --- compile 23 Oct 2005 20:52:21 -0000 1.2 *************** *** 1,7 **** #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. ! # Copyright 1999, 2000 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # --- 1,8 ---- #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. ! scriptversion=2005-05-14.22 ! ! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # *************** *** 18,22 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you --- 19,23 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 25,76 **** # the same distribution terms that you use for the rest of that program. ! # Usage: ! # compile PROGRAM [ARGS]... ! # `-o FOO.o' is removed from the args passed to the actual compile. ! prog=$1 ! shift ofile= cfile= ! args= ! while test $# -gt 0; do ! case "$1" in ! -o) ! # configure might choose to run compile as `compile cc -o foo foo.c'. ! # So we do something ugly here. ! ofile=$2 ! shift ! case "$ofile" in ! *.o | *.obj) ! ;; ! *) ! args="$args -o $ofile" ! ofile= ! ;; ! esac ! ;; ! *.c) ! cfile=$1 ! args="$args $1" ! ;; ! *) ! args="$args $1" ! ;; ! esac ! shift done if test -z "$ofile" || test -z "$cfile"; then ! # If no `-o' option was seen then we might have been invoked from a ! # pattern rule where we don't need one. That is ok -- this is a ! # normal compilation that the losing compiler can handle. If no ! # `.c' file was seen then we are probably linking. That is also ! # ok. ! exec "$prog" $args fi # Name of file we expect compiler to create. ! cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. --- 26,108 ---- # the same distribution terms that you use for the rest of that program. ! # This file is maintained in Automake, please report ! # bugs to <bug...@gn...> or send patches to ! # <aut...@gn...>. ! case $1 in ! '') ! echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ! exit 1; ! ;; ! -h | --h*) ! cat <<\EOF ! Usage: compile [--help] [--version] PROGRAM [ARGS] ! ! Wrapper for compilers which do not understand `-c -o'. ! Remove `-o dest.o' from ARGS, run PROGRAM with the remaining ! arguments, and rename the output as expected. ! ! If you are trying to build a whole package this is not the ! right script to run: please start by reading the file `INSTALL'. ! ! Report bugs to <bug...@gn...>. ! EOF ! exit $? ! ;; ! -v | --v*) ! echo "compile $scriptversion" ! exit $? ! ;; ! esac ofile= cfile= ! eat= ! ! for arg ! do ! if test -n "$eat"; then ! eat= ! else ! case $1 in ! -o) ! # configure might choose to run compile as `compile cc -o foo foo.c'. ! # So we strip `-o arg' only if arg is an object. ! eat=1 ! case $2 in ! *.o | *.obj) ! ofile=$2 ! ;; ! *) ! set x "$@" -o "$2" ! shift ! ;; ! esac ! ;; ! *.c) ! cfile=$1 ! set x "$@" "$1" ! shift ! ;; ! *) ! set x "$@" "$1" ! shift ! ;; ! esac ! fi ! shift done if test -z "$ofile" || test -z "$cfile"; then ! # If no `-o' option was seen then we might have been invoked from a ! # pattern rule where we don't need one. That is ok -- this is a ! # normal compilation that the losing compiler can handle. If no ! # `.c' file was seen then we are probably linking. That is also ! # ok. ! exec "$@" fi # Name of file we expect compiler to create. ! cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. *************** *** 78,99 **** # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. ! lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d while true; do ! if mkdir $lockdir > /dev/null 2>&1; then ! break ! fi ! sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. ! trap "rmdir $lockdir; exit 1" 1 2 15 # Run the compile. ! "$prog" $args ! status=$? if test -f "$cofile"; then ! mv "$cofile" "$ofile" fi ! rmdir $lockdir ! exit $status --- 110,142 ---- # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. ! lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do ! if mkdir "$lockdir" >/dev/null 2>&1; then ! break ! fi ! sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. ! trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. ! "$@" ! ret=$? if test -f "$cofile"; then ! mv "$cofile" "$ofile" ! elif test -f "${cofile}bj"; then ! mv "${cofile}bj" "$ofile" fi ! rmdir "$lockdir" ! exit $ret ! ! # Local Variables: ! # mode: shell-script ! # sh-indentation: 2 ! # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "scriptversion=" ! # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-end: "$" ! # End: Index: conf.change.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/conf.change.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** conf.change.pl 12 Apr 2005 13:06:44 -0000 1.5 --- conf.change.pl 23 Oct 2005 20:52:21 -0000 1.6 *************** *** 20,25 **** # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. # we have to change two places --- 20,25 ---- # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! # Boston, MA 02110-1301, USA. # we have to change two places Index: config.guess =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.guess,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.guess 12 Apr 2005 13:06:44 -0000 1.7 --- config.guess 23 Oct 2005 20:52:21 -0000 1.8 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, [...1720 lines suppressed...] c4*) echo c4-convex-bsd ! exit ;; esac fi *************** *** 1410,1414 **** download the most up to date version of the config scripts from ! ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please --- 1423,1429 ---- download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ! and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please Index: config.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.pl 12 Apr 2005 13:06:44 -0000 1.5 --- config.pl 23 Oct 2005 20:52:21 -0000 1.6 *************** *** 26,31 **** # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. use strict; --- 26,31 ---- # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! # Boston, MA 02110-1301, USA. use strict; *************** *** 54,57 **** --- 54,58 ---- open(CF, "< $ac_subs") || die "can't open $ac_subs: $!"; my @subs = <CF>; + my $pat; close(CF); chomp @subs; *************** *** 61,65 **** if ($bad_perl) { print "Using perl older than version 5.005\n"; ! foreach my $pat (@subs) { if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ ) || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ ) --- 62,66 ---- if ($bad_perl) { print "Using perl older than version 5.005\n"; ! foreach $pat (@subs) { if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ ) || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ ) *************** *** 86,90 **** } } else { ! foreach my $pat (@subs) { if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) || ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) || --- 87,91 ---- } } else { ! foreach $pat (@subs) { if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) || ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) || *************** *** 193,198 **** my @infiles=split(' ', $infiles); my $i=0; ! foreach my $name (@infiles) { if (open(CF, "< $name")) { while (<CF>) { --- 194,200 ---- my @infiles=split(' ', $infiles); my $i=0; + my $name; ! foreach $name (@infiles) { if (open(CF, "< $name")) { while (<CF>) { Index: config.sub =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.sub,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.sub 12 Apr 2005 13:06:44 -0000 1.7 --- config.sub 23 Oct 2005 20:52:21 -0000 1.8 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-07-01' # This file is (in principle) common to ALL GNU software. *************** *** 22,28 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. ! # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 22,28 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ! # 02110-1301, USA. ! # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a *************** *** 30,33 **** --- 30,34 ---- # the same distribution terms that you use for the rest of that program. + # Please send patches to <con...@gn...>. Submit a context # diff and a properly formatted ChangeLog entry. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. --- 72,76 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 84,92 **** case $1 in --time-stamp | --time* | -t ) ! echo "$timestamp" ; exit 0 ;; --version | -v ) ! echo "$version" ; exit 0 ;; --help | --h* | -h ) ! echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; --- 85,93 ---- case $1 in --time-stamp | --time* | -t ) ! echo "$timestamp" ; exit ;; --version | -v ) ! echo "$version" ; exit ;; --help | --h* | -h ) ! echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; *************** *** 100,104 **** # First pass through any local machine types. echo $1 ! exit 0;; * ) --- 101,105 ---- # First pass through any local machine types. echo $1 ! exit ;; * ) *************** *** 232,235 **** --- 233,237 ---- | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ *************** *** 238,242 **** | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 240,244 ---- | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 247,250 **** --- 249,253 ---- | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ *************** *** 255,261 **** | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | msp430 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ --- 258,265 ---- | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | ms1 \ | msp430 \ | ns16k | ns32k \ ! | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ *************** *** 263,275 **** | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. --- 267,283 ---- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. *************** *** 299,303 **** | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ --- 307,311 ---- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ *************** *** 311,315 **** | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 319,323 ---- | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 320,323 **** --- 328,332 ---- | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ *************** *** 328,331 **** --- 337,341 ---- | mipstx39-* | mipstx39el-* \ | mmix-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ *************** *** 337,341 **** | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ --- 347,352 ---- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ! | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ *************** *** 344,352 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. --- 355,365 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. *************** *** 458,461 **** --- 471,477 ---- basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis *************** *** 487,490 **** --- 503,510 ---- os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull *************** *** 752,758 **** os=-proelf ;; ! or32 | or32-*) basic_machine=or32-unknown - os=-coff ;; os400) --- 772,777 ---- os=-proelf ;; ! openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) *************** *** 1027,1030 **** --- 1046,1053 ---- os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell *************** *** 1079,1085 **** basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun --- 1102,1105 ---- *************** *** 1168,1172 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1188,1192 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1295,1298 **** --- 1315,1321 ---- os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *************** *** 1543,1547 **** echo $basic_machine$os ! exit 0 # Local variables: --- 1566,1570 ---- echo $basic_machine$os ! exit # Local variables: Index: configure.in.bot.end =================================================================== RCS file: /cvsroot/kbear/kbear/admin/configure.in.bot.end,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in.bot.end 12 Apr 2005 13:06:44 -0000 1.2 --- configure.in.bot.end 23 Oct 2005 20:52:21 -0000 1.3 *************** *** 17,20 **** --- 17,35 ---- fi + if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then + echo "" + echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" + echo "was not included. Therefore, GCC symbol visibility support remains disabled." + echo "" + echo "For better performance, consider including the Qt visibility supporting patch" + echo "located at:" + echo "" + echo "http://bugs.kde.org/show_bug.cgi?id=109386" + echo "" + echo "and recompile all of Qt and KDE. Note, this is entirely optional and" + echo "everything will continue to work just fine without it." + echo "" + fi + if test "$all_tests" = "bad"; then if test ! "$cache_file" = "/dev/null"; then Index: configure.in.min =================================================================== RCS file: /cvsroot/kbear/kbear/admin/configure.in.min,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in.min 9 Dec 2001 12:45:30 -0000 1.3 --- configure.in.min 23 Oct 2005 20:52:21 -0000 1.4 *************** *** 14,19 **** dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! dnl Boston, MA 02111-1307, USA. # Original Author was Ka...@kd... --- 14,19 ---- dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! dnl Boston, MA 02110-1301, USA. # Original Author was Ka...@kd... Index: cvs.sh =================================================================== RCS file: /cvsroot/kbear/kbear/admin/cvs.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cvs.sh 12 Apr 2005 13:06:44 -0000 1.6 --- cvs.sh 23 Oct 2005 20:52:21 -0000 1.7 *************** *** 45,49 **** ;; esac ! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in --- 45,49 ---- ;; esac ! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in *************** *** 61,66 **** esac - unset UNSERMAKE || : - AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` required_automake_version="1.6.1 or newer" --- 61,64 ---- *************** *** 71,75 **** exit 1 ;; ! automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." --- 69,76 ---- exit 1 ;; ! automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) ! echo "*** $AUTOMAKE_STRING found." ! UNSERMAKE=no ! ;; "" ) echo "*** AUTOMAKE NOT FOUND!." *************** *** 131,134 **** --- 132,136 ---- echo "*** Creating config.h template" $AUTOHEADER || exit 1 + touch config.h.in fi *************** *** 136,140 **** $AUTOMAKE || exit 1 ! if test -z "$UNSERMAKE"; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 --- 138,142 ---- $AUTOMAKE || exit 1 ! if test "$UNSERMAKE" = no; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 *************** *** 186,192 **** echo "*** Creating config.h template" $AUTOHEADER || exit 1 fi ! $AUTOMAKE --foreign ! if test -z "$UNSERMAKE"; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 --- 188,195 ---- echo "*** Creating config.h template" $AUTOHEADER || exit 1 + touch config.h.in fi ! $AUTOMAKE --foreign || exit 1 ! if test "$UNSERMAKE" = no; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 *************** *** 219,222 **** --- 222,226 ---- $ACLOCAL $ACLOCALFLAGS $AUTOHEADER + touch config.h.in $AUTOMAKE AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` *************** *** 313,317 **** fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then ! VERSION="\"3.4.0\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then --- 317,321 ---- fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then ! VERSION="\"3.4.92\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then *************** *** 506,520 **** } - cvs_clean() - { - if test -d CVS; then :; else - echo "You don't have a toplevel CVS directory." - echo "You most certainly didn't use cvs to get these sources." - echo "But this function depends on cvs's inf... [truncated message content] |
