aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/am_edit47
-rw-r--r--conf/m4/kde/AC_CREATE_KFSSTND.m4165
-rw-r--r--conf/m4/kde/AC_SUBST_KFSSTND.m41
-rw-r--r--conf/m4/kde/KDE_VERSION.m42
4 files changed, 129 insertions, 86 deletions
diff --git a/conf/am_edit b/conf/am_edit
index 0f7ad8a..9cb2ca6 100644
--- a/conf/am_edit
+++ b/conf/am_edit
@@ -345,19 +345,39 @@ sub processMakefile ($)
appendLines($cvs_lines);
$target_adds{"clean"} .= "kde-rpo-clean ";
- foreach $add (keys %target_adds) {
- my $lookup = "$add:\s*(.*)";
+ # some strange people like to do a install-exec, and expect that also
+ # all modules are installed. automake doesn't know this, so we need to move
+ # this here from install-data to install-exec.
+ if ($MakefileData =~ m/\nkdemodule_LTLIBRARIES\s*=/) {
+ $target_adds{"install-exec-am"} .= "install-kdemoduleLTLIBRARIES";
+ my $lookup = 'install-data-am:\s*(.*)';
if ($MakefileData =~ /\n$lookup\n/) {
- substituteLine($lookup, "$add: " . $target_adds{$add} . $1);
+ my $newdeps = $1;
+ $newdeps =~ s/\s*install-kdemoduleLTLIBRARIES\s*/ /g;
+ substituteLine($lookup, "install-data-am: " . $newdeps);
}
}
+
+ my $lines = "";
+
+ foreach $add (keys %target_adds) {
+ my $lookup = quotemeta($add) . ':([^\n]*)';
+ if ($MakefileData =~ /\n$lookup\n/) {
+ substituteLine($lookup, "$add: " . $target_adds{$add} . $1);
+ } else {
+ $lines .= "$add: " . $target_adds{$add} . "\n";
+ }
+ }
+ if ($lines) {
+ appendLines($lines);
+ }
my $found = 1;
while ($found) {
if ($MakefileData =~ m/\n(.*)\$\(CXXFLAGS\)(.*)\n/) {
- my $vor = $1;
- my $nach = $2;
+ my $vor = $1; # "vor" means before in German
+ my $nach = $2; # "nach" means after in German
my $lookup = quotemeta("$1\$(CXXFLAGS)$2");
my $replacement = "$1\$(KCXXFLAGS)$2";
$MakefileData =~ s/$lookup/$replacement/;
@@ -369,8 +389,24 @@ sub processMakefile ($)
}
}
+# $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))';
+#
+# if ($MakefileData =~ m/$lookup/ ) {
+# $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
+# }
+#
+# $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile) (\$\(CXX\).*\$\(KCXXFLAGS\))';
+# if ($MakefileData =~ m/$lookup/ ) {
+# $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
+# }
+
$MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
+ $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+ if ($MakefileData =~ m/\n$lookup\n/) {
+ substituteLine($lookup, "$1cp -pr \$\$d/\$\$file \$(distdir)/\$\$file$2");
+ }
+
# Always update the Makefile.in
updateMakefile ();
return;
@@ -1078,6 +1114,7 @@ sub tag_ICON()
'hi22' => 'hicolor/22x22',
'hi32' => 'hicolor/32x32',
'hi48' => 'hicolor/48x48',
+ 'hi64' => 'hicolor/64x64',
'hisc' => 'hicolor/scalable'
);
diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4
index de4653c..bc8485b 100644
--- a/conf/m4/kde/AC_CREATE_KFSSTND.m4
+++ b/conf/m4/kde/AC_CREATE_KFSSTND.m4
@@ -1,92 +1,95 @@
-AC_DEFUN(AC_CREATE_KFSSTND,
-[
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
+AC_DEFUN(AC_CREATE_KFSSTND,[
+ AC_REQUIRE([KDE_VERSION])
+ AC_MSG_CHECKING([for KDE paths])
+ kde_result=""
-AC_CACHE_VAL(kde_cv_all_paths,
-[
- if test -z "$kde_htmldir"; then
- kde_htmldir='\$(kde_prefix)/share/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
- kde_appsdir='\$(kde_prefix)/share/applnk'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\$(kde_prefix)/share/icons'
- fi
- if test -z "$kde_sounddir"; then
- kde_sounddir='\$(kde_prefix)/share/sounds'
- fi
- if test -z "$kde_datadir"; then
- kde_datadir='\$(kde_prefix)/share/apps'
- fi
- if test -z "$kde_locale"; then
- kde_locale='\$(kde_prefix)/share/locale'
- fi
- if test -z "$kde_cgidir"; then
- kde_cgidir='\$(kde_exec_prefix)/cgi-bin'
- fi
- if test -z "$kde_confdir"; then
- kde_confdir='\$(kde_prefix)/share/config'
- fi
- if test -z "$kde_mimedir"; then
- kde_mimedir='\$(kde_prefix)/share/mimelnk'
- fi
- if test -z "$kde_toolbardir"; then
- kde_toolbardir='\$(kde_prefix)/share/toolbar'
- fi
- if test -z "$kde_wallpaperdir"; then
- kde_wallpaperdir='\$(kde_prefix)/share/wallpapers'
- fi
- if test -z "$kde_bindir"; then
- kde_bindir='\$(kde_exec_prefix)/bin'
- fi
- if test -z "$kde_servicesdir"; then
- kde_servicesdir='\$(kde_prefix)/share/services'
- fi
- if test -z "$kde_servicetypesdir"; then
- kde_servicetypesdir='\$(kde_prefix)/share/servicetypes'
- fi
+ AC_CACHE_VAL(kde_cv_all_paths,[
+ if test -z "$kde_htmldir"; then
+ kde_htmldir='\$(kde_prefix)/share/doc/HTML'
+ fi
+ if test -z "$kde_appsdir"; then
+ kde_appsdir='\$(kde_prefix)/share/applnk'
+ fi
+ if test -z "$kde_icondir"; then
+ kde_icondir='\$(kde_prefix)/share/icons'
+ fi
+ if test -z "$kde_sounddir"; then
+ kde_sounddir='\$(kde_prefix)/share/sounds'
+ fi
+ if test -z "$kde_datadir"; then
+ kde_datadir='\$(kde_prefix)/share/apps'
+ fi
+ if test -z "$kde_locale"; then
+ kde_locale='\$(kde_prefix)/share/locale'
+ fi
+ if test -z "$kde_cgidir"; then
+ kde_cgidir='\$(kde_exec_prefix)/cgi-bin'
+ fi
+ if test -z "$kde_confdir"; then
+ kde_confdir='\$(kde_prefix)/share/config'
+ fi
+ if test -z "$kde_mimedir"; then
+ kde_mimedir='\$(kde_prefix)/share/mimelnk'
+ fi
+ if test -z "$kde_toolbardir"; then
+ kde_toolbardir='\$(kde_prefix)/share/toolbar'
+ fi
+ if test -z "$kde_wallpaperdir"; then
+ kde_wallpaperdir='\$(kde_prefix)/share/wallpapers'
+ fi
+ if test -z "$kde_bindir"; then
+ kde_bindir='\$(kde_exec_prefix)/bin'
+ fi
+ if test -z "$kde_servicesdir"; then
+ kde_servicesdir='\$(kde_prefix)/share/services'
+ fi
+ if test -z "$kde_servicetypesdir"; then
+ kde_servicetypesdir='\$(kde_prefix)/share/servicetypes'
+ fi
+ if test -z "$kde_moduledir"; then
+ kde_moduledir='\$(kde_exec_prefix)/lib/kde\$(kdeversion)'
+ fi
- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
- kde_htmldir=\"$kde_htmldir\" \
- kde_appsdir=\"$kde_appsdir\" \
- kde_icondir=\"$kde_icondir\" \
- kde_sounddir=\"$kde_sounddir\" \
- kde_datadir=\"$kde_datadir\" \
- kde_locale=\"$kde_locale\" \
- kde_cgidir=\"$kde_cgidir\" \
- kde_confdir=\"$kde_confdir\" \
- kde_mimedir=\"$kde_mimedir\" \
- kde_toolbardir=\"$kde_toolbardir\" \
- kde_wallpaperdir=\"$kde_wallpaperdir\" \
- kde_bindir=\"$kde_bindir\" \
- kde_servicesdir=\"$kde_servicesdir\" \
- kde_servicetypesdir=\"$kde_servicetypesdir\" \
- kde_result=defaults"
+ kde_cv_all_paths="kde_have_all_paths=\"yes\" \
+ kde_htmldir=\"$kde_htmldir\" \
+ kde_appsdir=\"$kde_appsdir\" \
+ kde_icondir=\"$kde_icondir\" \
+ kde_sounddir=\"$kde_sounddir\" \
+ kde_datadir=\"$kde_datadir\" \
+ kde_locale=\"$kde_locale\" \
+ kde_cgidir=\"$kde_cgidir\" \
+ kde_confdir=\"$kde_confdir\" \
+ kde_mimedir=\"$kde_mimedir\" \
+ kde_toolbardir=\"$kde_toolbardir\" \
+ kde_wallpaperdir=\"$kde_wallpaperdir\" \
+ kde_bindir=\"$kde_bindir\" \
+ kde_servicesdir=\"$kde_servicesdir\" \
+ kde_servicetypesdir=\"$kde_servicetypesdir\" \
+ kde_moduledir=\"$kde_moduledir\" \
+ kde_result=defaults"
-])
+ ])
-eval "$kde_cv_all_paths"
+ eval "$kde_cv_all_paths"
-if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
- test -z "$kde_datadir" || test -z "$kde_locale" ||
- test -z "$kde_cgidir" || test -z "$kde_confdir" ||
- test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
- test -z "$kde_wallpaperdir" || test -z "$kde_bindir" ||
- test -z "$kde_servicesdir" ||
- test -z "$kde_servicetypesdir" || test "$kde_have_all_paths" != "yes"; then
- kde_have_all_paths=no
- AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
+ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
+ test -z "$kde_icondir" || test -z "$kde_sounddir" ||
+ test -z "$kde_datadir" || test -z "$kde_locale" ||
+ test -z "$kde_cgidir" || test -z "$kde_confdir" ||
+ test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
+ test -z "$kde_wallpaperdir" || test -z "$kde_bindir" ||
+ test -z "$kde_servicesdir" || test -z "$kde_moduledir" ||
+ test -z "$kde_servicetypesdir" ||
+ test "$kde_have_all_paths" != "yes"; then
+ kde_have_all_paths=no
+ AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
Since it had compiled and linked before, it must be a strange problem on your system.
Look at config.log for details. If you are not able to fix this, look at
http://www.kde.org/faq/installation.html or any www.kde.org mirror.
(If you're using an egcs version on Linux, you may update binutils!)
])
-else
- rm -f conftest*
- AC_MSG_RESULT($kde_result)
-fi
-
+ else
+ rm -f conftest*
+ AC_MSG_RESULT($kde_result)
+ fi
])
diff --git a/conf/m4/kde/AC_SUBST_KFSSTND.m4 b/conf/m4/kde/AC_SUBST_KFSSTND.m4
index 5c1316f..c3d4962 100644
--- a/conf/m4/kde/AC_SUBST_KFSSTND.m4
+++ b/conf/m4/kde/AC_SUBST_KFSSTND.m4
@@ -14,4 +14,5 @@ AC_SUBST(kde_wallpaperdir)
AC_SUBST(kde_bindir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
+AC_SUBST(kde_moduledir)
])
diff --git a/conf/m4/kde/KDE_VERSION.m4 b/conf/m4/kde/KDE_VERSION.m4
index 37e47b2..65fee9d 100644
--- a/conf/m4/kde/KDE_VERSION.m4
+++ b/conf/m4/kde/KDE_VERSION.m4
@@ -12,4 +12,6 @@ AC_DEFUN(KDE_VERSION,
;;
esac
AC_MSG_RESULT($ac_kde_version.x)
+ kdeversion=$ac_kde_version
+ AC_SUBST(kdeversion)
])
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 05:13:13 +0000