Update of /cvsroot/fink/experimental/rangerrick/finkinfo/kde
In directory usw-pr-cvs1:/tmp/cvs-serv17098
Added Files:
kdeartwork3-3.0.9-1.info kdeartwork3-3.0.9-1.patch
Removed Files:
kdeartwork3-3.0.8-1.info kdeartwork3-3.0.8-1.patch
Log Message:
kdeartwork builds
--- NEW FILE: kdeartwork3-3.0.9-1.info ---
Package: kdeartwork3
Version: 3.0.9
Revision: 1
GCC: 3.1
Depends: kde-extra-sounds (>= %v-%r), kde-extra-themes (>= %v-%r),
kde-extra-wallpapers (>= %v-%r), kde-icons-classic (>= %v-%r), kde-icons-ikons (>=
%v-%r), kde-icons-locolor (>= %v-%r), kde-icons-technical (>= %v-%r), kde-icons-slick
(>= %v-%r), kworldclock-maps (>= %v-%r), kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1),
kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1)
BuildDepends: arts-dev (>= 1.1.0-5), kdelibs3-ssl-dev (>= %v-1) | kdelibs3-dev (>=
%v-1), kdebase3-ssl-dev (>= %v-1) | kdebase3-dev (>= %v-1), automake (>= 1.6),
autoconf25, libtool14, fink (>= 0.10.0), dlcompat, qt3 (>= 3.1.0), libpng3 (>= 1.2.4),
kworldclock (>= %v-1)
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Conflicts: %N (<< %v-%r)
Replaces: %N (<< %v-%r)
Source: ftp://ktown.kde.org/pub/kde/unstable/kde-3.1-rc1/src/kdeartwork-%v.tar.bz2
Source-MD5: e4e58d07dbe32d782b9ff2fc14d6d7bb
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p0
SetLDFLAGS: -L%p/lib
SetCPPFLAGS: -no-cpp-precomp -Ddlsym=dlsym_auto_underscore
SetCFLAGS: -fno-common
ConfigureParams: --prefix=%p --with-qt-dir=%p --with-qt-includes=%p/include/qt
--with-extra-libs=%p/lib --with-extra-includes=%p/include --enable-mt --with-pic
--enable-rpath --enable-shared=yes --enable-static=no --mandir=%i/share/man
--with-xinerama --enable-final --disable-dependency-tracking `cat
/tmp/kde-build-options`
CompileScript: <<
#!/bin/sh
make -f Makefile.cvs
export KDEDIR=%p
echo running ./configure %c
sh ./configure %c
make -j2
<<
InstallScript: <<
make install DESTDIR=%d
<<
SplitOff: <<
Package: kde-extra-themes
Depends: dlcompat (>= 20020929), kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1),
kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), libart2-shlibs (>= 2.3.9), libpng3-shlibs
(>= 1.2.4), qt3-shlibs (>= 3.1.0), x11
Recommends: %N
BuildDependsOnly: true
Description: KDE - extra window styles and themes
Files: <<
lib/kde3/kwin*.la
lib/kde3/libkwin*
lib/kde3/plugins/styles
share/apps/kstyle/themes
share/apps/kwin
<<
Replaces: %N (<< %v-%r)
<<
SplitOff2: <<
Package: kworldclock-maps
Depends: kworldclock (>= %v-1)
Recommends: kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), kdebase3-ssl (>= %v-1) |
kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - extra maps for kworldclock
Files: <<
share/apps/kworldclock
<<
Replaces: %N (<< %v-%r)
<<
SplitOff3: <<
Package: kde-icons-classic
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - "Classic" icon set
Files: <<
share/icons/kdeclassic
<<
<<
SplitOff4: <<
Package: kde-icons-locolor
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - "Locolor" icon set
Files: <<
share/icons/Locolor
<<
Replaces: %N (<< %v-%r)
<<
SplitOff5: <<
Package: kde-icons-technical
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - "Technical" icon set
Files: <<
share/icons/Technical
<<
Replaces: %N (<< %v-%r)
<<
SplitOff6: <<
Package: kde-icons-ikons
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - "ikons" icon set
Files: <<
share/icons/ikons
<<
Replaces: %N (<< %v-%r)
<<
SplitOff7: <<
Package: kde-icons-slick
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - "slick" icon set
Files: <<
share/icons/slick
<<
Replaces: %N (<< %v-%r)
<<
SplitOff8: <<
Package: kde-extra-sounds
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - extra sounds for startup and logout
Files: <<
share/sounds
<<
Replaces: %N (<< %v-%r)
<<
SplitOff9: <<
Package: kde-extra-wallpapers
Depends: arts (>= 1.1.0-5), kdelibs3-ssl (>= %v-1) | kdelibs3 (>= %v-1), qt3-shlibs
(>= 3.1.0)
Recommends: kdebase3-ssl (>= %v-1) | kdebase3 (>= %v-1), %N
BuildDependsOnly: true
Description: KDE - extra wallpaper images
Files: <<
share/wallpapers
<<
Replaces: %N (<< %v-%r)
<<
DocFiles: README
Description: KDE - additional artwork
DescDetail: <<
Install kdeartwork3 if you would like to install all of the kdeartwork
packages. kdeartwork3 contains:
kde-extra-sounds
kde-extra-themes
kde-extra-wallpapers
kde-icons-classic
kde-icons-ikons
kde-icons-locolor
kde-icons-slick
kde-icons-technical
kworldclock-maps
<<
License: GPL/LGPL
--- NEW FILE: kdeartwork3-3.0.9-1.patch ---
Index: admin/Makefile.common
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/Makefile.common,v
retrieving revision 1.1.1.4
retrieving revision 1.5
diff -u -u -r1.1.1.4 -r1.5
Index: admin/acinclude.m4.in
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/acinclude.m4.in,v
retrieving revision 1.1.1.5
diff -u -u -r1.1.1.5 acinclude.m4.in
--- admin/acinclude.m4.in 29 Oct 2002 02:27:18 -0000 1.1.1.5
+++ admin/acinclude.m4.in 29 Oct 2002 22:05:53 -0000
@@ -704,13 +704,10 @@
AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
# darwin needs this to initialize the environment
- AC_CHECK_HEADERS(crt_externs.h)
+ AC_CHECK_HEADERS([crt_externs.h sys/types.h])
AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your
system needs _NSGetEnviron to set up the environment])])
- # more headers that need to be explicitly included on darwin
- AC_CHECK_HEADERS(sys/types.h stdint.h)
-
- # darwin requires a poll emulation library
+ # darwin requires a poll.h emulation library
AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
# CoreAudio framework
@@ -719,11 +716,36 @@
FRAMEWORK_COREAUDIO="-framework CoreAudio"
])
+ # CoreServices framework
+ AC_CHECK_HEADER(CoreServices/CoreServices.h, [
+ AC_DEFINE(HAVE_CORESERVICES, 1, [Define if you have the CoreServices API])
+ FRAMEWORK_CORESERVICES="-framework CoreServices"
+ ])
+
+ # Solaris 2.6 and others need -lresolv for res_init
+ AC_CHECK_FUNCS(res_init, , [
+ kde_libs_safe="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+ AC_TRY_LINK(
+[
+#include <resolv.h>
+],
+[
+res_init();
+],
+ LIBRESOLV="-lresolv"
+ X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
+ AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
+ )
+ LIBS=$kde_libs_safe
+ ])
+
AC_CHECK_RES_INIT
- AC_SUBST(LIB_POLL)
AC_SUBST(FRAMEWORK_COREAUDIO)
LIBSOCKET="$X_EXTRA_LIBS"
AC_SUBST(LIBSOCKET)
+ AC_SUBST(FRAMEWORK_CORESERVICES)
+ AC_SUBST(LIB_POLL)
AC_SUBST(LIBRESOLV)
AC_SUBST(X_EXTRA_LIBS)
AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
@@ -932,7 +954,7 @@
kde_ldflags_safe="$LDFLAGS"
kde_libs_safe="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
LIBS="-lXext -lX11 $LIBSOCKET"
AC_TRY_LINK([
@@ -974,9 +996,9 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_CFLAGS="$CFLAGS"
kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
+LIBS="-lXinerama -lXext -lX11"
if test "x$no_xinerama" = "xno"; then
@@ -1907,15 +1929,29 @@
AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then
+ AC_SUBST(LIB_ARTSKDE, "-lartskde")
+ AC_SUBST(LIB_DCOP, "-lDCOP")
+ AC_SUBST(LIB_KAB, "-lkab")
+ AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KDECORE, "-lkdecore")
+ AC_SUBST(LIB_KDED, "@PREFIX@/lib/kded.la")
+ AC_SUBST(LIB_KDEFX, "-lkdefx")
+ AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDESASL, "-lkdesasl")
+ AC_SUBST(LIB_KDESU, "-lkdesu")
AC_SUBST(LIB_KDEUI, "-lkdeui")
- AC_SUBST(LIB_KIO, "-lkio")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
+ AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KJAVA, "-lkjava")
+ AC_SUBST(LIB_KJS, "-lkjs")
+ AC_SUBST(LIB_KMID, "-lkmid")
+ AC_SUBST(LIB_KSCRIPT, "-lkscript")
+ AC_SUBST(LIB_KSPELL, "-lkspell")
+ AC_SUBST(LIB_KTEXTEDITOR, "-lktexteditor")
+ AC_SUBST(LIB_SHELLSCRIPT, "-lshellscript")
+ AC_SUBST(LIB_SMB, "-lsmb")
+ AC_SUBST(LIB_VCARD, "-lvcard")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@@ -2646,10 +2682,10 @@
if test $kde_use_debug_code = "full"; then
CFLAGS="-g3 $CFLAGS"
else
- CFLAGS="-g -O2 $CFLAGS"
+ CFLAGS="-g -O $CFLAGS"
fi
else
- CFLAGS="-O2 $CFLAGS"
+ CFLAGS="-Os -frename-registers -mmultiple -mcpu=750 -mtune=750 $CFLAGS"
fi
fi
@@ -2679,7 +2715,7 @@
if test "$kde_use_debug_code" = "full"; then
CXXFLAGS="-g3 $CXXFLAGS"
else
- CXXFLAGS="-g -O2 $CXXFLAGS"
+ CXXFLAGS="-g -O $CXXFLAGS"
fi
fi
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
@@ -2691,7 +2727,7 @@
if test "$CXX" = "KCC"; then
CXXFLAGS="+K3 $CXXFLAGS"
else
- CXXFLAGS="-O2 $CXXFLAGS"
+ CXXFLAGS="-Os -frename-registers -mmultiple -mcpu=750 -mtune=750 $CXXFLAGS"
fi
fi
fi
@@ -3188,9 +3224,9 @@
ac_save_ldflags="$LDFLAGS"
ac_save_cflags="$CFLAGS"
if test "x$kde_use_qt_emb" != "xyes"; then
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
-lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
+ LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
+-lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
else
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
-lXpm $LIBZ $LIBSOCKET"
+ LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
+-lXpm $LIBZ $LIBSOCKET"
fi
CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
@@ -4625,6 +4661,83 @@
done
])
+AC_DEFUN(KDE_CHECK_LDAP,
+[
+ AC_MSG_CHECKING([for LDAP])
+
+ if test -n "$1"; then
+ ldap_extra_dirs="$1"
+ fi
+
+ ldap_incdirs="$ldap_extra_dirs/include /usr/include /usr/local/include/
+$kde_extra_includes"
+ AC_FIND_FILE(ldap.h, $ldap_incdirs, ldap_incdir)
+ if test ! -r $ldap_incdir/ldap.h; then
+ ldap_incdir=no
+ fi
+
+ ldap_libdirs="$ldap_extra_dirs/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
+ for ext in la so sl dylib a; do
+ AC_FIND_FILE(libldap.$ext, $ldap_libdirs, ldap_libdir_test)
+ if test -r $ldap_libdir_test/libldap.$ext; then
+ ldap_libdir=$ldap_libdir_test
+ break
+ fi
+ done
+ if test -z "$ldap_libdir"; then
+ ldap_libdir=no
+ fi
+ if test x$ldap_libdir != xno && test x$ldap_incdir != xno; then
+ LDAP_INCS=-I$ldap_incdir
+ LDAP_LIBS=-L$ldap_libdir
+ # on MacOSX, we link against the framework instead of
+ # directly to the libraries, for forward-compatibility
+ if test -d "/System/Library/Frameworks/LDAP.framework"; then
+ LIBLDAP="-framework LDAP"
+ else
+ LIBLDAP="-lldap -llber -lresolv"
+ fi
+ if test "$USE_RPATH" = "yes"; then
+ LDAP_RPATH="-R $LDAPLIBDIR/lib"
+ fi
+
+ kde_safe_LIBS="$LIBS"
+ kde_safe_CFLAGS="$CFLAGS"
+ LIBS="$LIBS $all_libraries $LDAP_LIBS $LIBLDAP $KERBEROS_LIBS $X_EXTRA_LIBS"
+ CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KERBEROS_INCS"
+ AC_LANG_SAVE
+ AC_LANG_C
+ AC_TRY_LINK(
+ [#include <lber.h>
+#include <ldap.h>
+#if LDAP_VENDOR_VERSION < 20000
+#error OpenLDAP version too old, please upgrade to version 2 or higher
+#endif
+],
+ [ LDAP *ldap; ],
+ [ ldap_old=no ],
+ [ ldap_old=yes ]
+ )
+ LIBS="$kde_safe_LIBS"
+ CFLAGS="$kde_safe_CFLAGS"
+
+ if test x$ldap_old = xno; then
+ AC_SUBST(LDAP_INCS)
+ AC_SUBST(LDAP_LIBS)
+ AC_SUBST(LDAP_RPATH)
+ AC_SUBST(LIBLDAP)
+ AC_DEFINE_UNQUOTED(HAVE_LIBLDAP,1,[Define if you have LDAP libraries])
+ else
+ LDAP_INCS=
+ LDAP_LIBS=
+ LDAP_RPATH=
+ LIBLDAP=
+ fi
+ AC_MSG_RESULT([libraries $ldap_libdir, headers $ldap_incdir])
+ else
+ AC_MSG_RESULT([not found])
+ fi
+])
+
dnl KDE_CHEC_JAVA_DIR(onlyjre)
AC_DEFUN(KDE_CHECK_JAVA_DIR,
[
@@ -4659,6 +4772,7 @@
KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
KDE_JAVA_PREFIX(/opt/java*)
+ KDE_JAVA_PREFIX(/Library/Java/Home)
kde_cv_path="NONE"
kde_save_IFS=$IFS
@@ -4710,10 +4824,20 @@
dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
if test "x$kde_java_bindir" != "xno"; then
+ case $host_os in
+ darwin*)
+ dnl Look for libjvm.dylib
+ kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.dylib | sed
+'s,libjvm.dylib,,'|head -n 1`
+ kd_java_libhpidir=''
+ dnl Darwin doesn't have libhpi
+ ;;
+ *)
dnl Look for libjvm.so
kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed
's,libjvm.so,,'|head -n 1`
dnl Look for libhpi.so and avoid green threads
- kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed
's,libhpi.so,,' | head -n 1`
+ kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed
+'s,libhpi.so,,' | tail -n 1`
+ ;;
+ esac
dnl Now check everything's fine under there
dnl the include dir is our flag for having the JDK
@@ -4742,17 +4866,29 @@
JAVAC=
jni_includes=
fi
-
+ case $host_os in
+ darwin*)
+ if test ! -r "$kde_java_libjvmdir/libjvm.dylib"; then
+ AC_MSG_ERROR([libjvm.dylib not found under $kde_java_libjvmdir. Use
+--without-java.])
+ fi
+ dnl Darwin doesn't have libhpi, but it's not fatal
+ LIB_JVM="-framework JavaVM"
+ LIB_HPI=""
+ ;;
+ *)
if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use
--without-java.])
fi
+ LIB_JVM="-L$kde_java_libjvmdir -ljvm"
+ if test ! -r "$kde_java_libhpidir/libhpi.so"; then
+ AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use
+--without-java.])
+ fi
+ LIB_HPI="-L$kde_java_libhpidir -lhpi"
+ ;;
+ esac
if test ! -x "$kde_java_bindir/java"; then
AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though!
Use --with-java or --without-java.])
- fi
-
- if test ! -r "$kde_java_libhpidir/libhpi.so"; then
- AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
if test -n "$jni_includes"; then
Index: admin/detect-autoconf.sh
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/detect-autoconf.sh,v
retrieving revision 1.1.1.2
retrieving revision 1.3
diff -u -u -r1.1.1.2 -r1.3
--- admin/detect-autoconf.sh 29 Oct 2002 02:27:20 -0000 1.1.1.2
+++ admin/detect-autoconf.sh 29 Oct 2002 02:29:54 -0000 1.3
@@ -42,12 +42,12 @@
checkAutomakeAclocal ()
{
if test -z "$UNSERMAKE"; then
- if test -x "`$WHICH automake-1.5`" ; then
- AUTOMAKE="`$WHICH automake-1.5`"
- ACLOCAL="`$WHICH aclocal-1.5`"
- elif test -x "`$WHICH automake-1.6`" ; then
+ if test -x "`$WHICH automake-1.6`" ; then
AUTOMAKE="`$WHICH automake-1.6`"
ACLOCAL="`$WHICH aclocal-1.6`"
+ elif test -x "`$WHICH automake-1.5`" ; then
+ AUTOMAKE="`$WHICH automake-1.5`"
+ ACLOCAL="`$WHICH aclocal-1.5`"
fi
else
AUTOMAKE="$UNSERMAKE"
Index: admin/libtool.m4.in
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/libtool.m4.in,v
retrieving revision 1.1.1.3
retrieving revision 1.7
diff -u -u -r1.1.1.3 -r1.7
--- admin/libtool.m4.in 14 Aug 2002 13:18:45 -0000 1.1.1.3
+++ admin/libtool.m4.in 16 Sep 2002 14:31:34 -0000 1.7
@@ -609,6 +609,12 @@
lt_cv_sys_max_cmd_len=-1;
;;
+ darwin*)
+ # this should be enough... the length test freaks out some versions
+ # of OSX's `expr`
+ lt_cv_sys_max_cmd_len=16384;
+ ;;
+
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -1132,7 +1138,7 @@
darwin* | rhapsody*)
dynamic_linker="$host_os dyld"
version_type=darwin
- need_lib_prefix=no
+ need_lib_prefix=yes
need_version=no
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
@@ -1901,16 +1907,7 @@
;;
darwin* | rhapsody*)
- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
- ;;
- esac
+ lt_cv_deplibs_check_method='pass_all'
;;
freebsd*)
@@ -2560,6 +2557,11 @@
;;
esac
;;
+ darwin*)
+ shared_flag='-dynamiclib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o
+${lib}-master.o $libobjs && $CC -dynamiclib -install_name $rpath/$soname
+$predep_objects ${lib}-master.o $deplibs $postdep_objects $compiler_flags -o $lib'
+ output_verbose_link_cmd='$CC -dynamiclib $CFLAGS -v conftest.$objext 2>&1 | egrep
+"\-L"'
+ ;;
dgux*)
case $cc_basename in
ec++)
@@ -4750,7 +4752,9 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
*) # Darwin 1.3 on
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ #_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ # testing with twolevel namespaces
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
;;
esac
@@ -4758,7 +4762,7 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
# `"' quotes if we put them in here... so don't!
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle ||
echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o
+${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo
+-dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $linker_flags
+$(test x$module != xyes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$_LT_AC_TAGVAR(archive_cmds, $1)"' &&
strip -s $export_symbols'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
Index: admin/ltmain.sh
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/ltmain.sh,v
retrieving revision 1.1.1.2
retrieving revision 1.4
diff -u -u -r1.1.1.2 -r1.4
--- admin/ltmain.sh 10 Jul 2002 02:47:39 -0000 1.1.1.2
+++ admin/ltmain.sh 13 Jul 2002 04:33:25 -0000 1.4
@@ -3321,7 +3321,23 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ tmp_deplibs=
+ for test_deplib in $deplibs; do
+ if test "$test_deplib" != "$conv"; then
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ fi
+ done
+ deplibs="$tmp_deplibs"
+ done
eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
if len=`expr "X$cmds" : ".*"` &&
@@ -3419,7 +3435,12 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
- eval cmds=\"$archive_cmds\"
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+ done
+ eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
# Append the command to remove the reloadable object files
@@ -3632,6 +3653,14 @@
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework
System /'`
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework
System /'`
;;
+ esac
+
+ case $host in
+ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ ;;
esac
compile_command="$compile_command $compile_deplibs"
Index: admin/missing
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/missing,v
retrieving revision 1.1.1.3
retrieving revision 1.5
diff -u -u -r1.1.1.3 -r1.5
Index: kscreensaver/configure.in.in
===================================================================
RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdeartwork/kscreensaver/configure.in.in,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -u -r1.1.1.3 -r1.2
--- kscreensaver/configure.in.in 14 Aug 2002 13:46:36 -0000 1.1.1.3
+++ kscreensaver/configure.in.in 7 Oct 2002 01:28:30 -0000 1.2
@@ -37,3 +37,4 @@
AC_CHECK_FUNCS(gettimeofday)
AC_HAVE_DPMS()
+DO_NOT_COMPILE="$DO_NOT_COMPILE kscreensaver"
Index: kscreensaver/kdesavers/Flux.cpp
===================================================================
RCS file:
/Volumes/src/cvs/od/proj/KDE-Darwin/kdeartwork/kscreensaver/kdesavers/Flux.cpp,v
retrieving revision 1.1.1.2
retrieving revision 1.3
diff -u -u -r1.1.1.2 -r1.3
--- kscreensaver/kdesavers/Flux.cpp 1 Oct 2002 02:06:28 -0000 1.1.1.2
+++ kscreensaver/kdesavers/Flux.cpp 1 Oct 2002 02:28:33 -0000 1.3
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
+#include <cmath>
#include <time.h>
#include <qtimer.h>
#include "Flux.h"
Index: kscreensaver/kdesavers/Makefile.am
===================================================================
RCS file:
/Volumes/src/cvs/od/proj/KDE-Darwin/kdeartwork/kscreensaver/kdesavers/Makefile.am,v
retrieving revision 1.1.1.3
retrieving revision 1.4
diff -u -u -r1.1.1.3 -r1.4
--- kscreensaver/kdesavers/Makefile.am 14 Aug 2002 13:46:38 -0000 1.1.1.3
+++ kscreensaver/kdesavers/Makefile.am 15 Aug 2002 22:10:14 -0000 1.4
@@ -9,8 +9,8 @@
LDADD = $(LIB_KDEUI) -lkscreensaver -lm $(GLLIB)
if COMPILE_GL_KSAVERS
-GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss
ksolarwinds.kss
-GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop
KEuphoria.desktop KSolarWinds.desktop
+GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss
+GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop
endif
bin_PROGRAMS = kbanner.kss kpolygon.kss kslideshow.kss \
@@ -30,9 +30,6 @@
kfountain_kss_SOURCES = fountain.cpp fountaincfg.ui
kwave_kss_SOURCES = wave.cpp wavecfg.ui
kgravity_kss_SOURCES = gravity.cpp gravitycfg.ui
-kflux_kss_SOURCES = Flux.cpp
-keuphoria_kss_SOURCES = Euphoria.cpp
-ksolarwinds_kss_SOURCES = SolarWinds.cpp
METASOURCES = AUTO
--- kdeartwork3-3.0.8-1.info DELETED ---
--- kdeartwork3-3.0.8-1.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
