From 0fed1cbff34d73a2580aafdc80f112c751990d8f Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Mon, 21 May 2001 21:48:09 +0000 Subject: Added --with-kdedir --- conf/m4/kde/AC_BASE_PATH_KDE.m4 | 26 +++++++++++++------------- conf/m4/kde/AC_CREATE_KFSSTND.m4 | 31 ++++++++++++++++--------------- conf/m4/kde/KDE_SUBST_PROGRAMS.m4 | 4 ++-- 3 files changed, 31 insertions(+), 30 deletions(-) (limited to 'conf/m4/kde') diff --git a/conf/m4/kde/AC_BASE_PATH_KDE.m4 b/conf/m4/kde/AC_BASE_PATH_KDE.m4 index 3878d1c..1654235 100644 --- a/conf/m4/kde/AC_BASE_PATH_KDE.m4 +++ b/conf/m4/kde/AC_BASE_PATH_KDE.m4 @@ -12,16 +12,16 @@ AC_REQUIRE([AC_PATH_QT])dnl AC_CHECK_RPATH AC_MSG_CHECKING([for KDE]) -if test "${prefix}" != NONE; then - kde_includes=${prefix}/include - ac_kde_includes=$prefix/include +if test "${kde_prefix}" != NONE; then + kde_includes=${kde_prefix}/include + ac_kde_includes=$kde_prefix/include - if test "${exec_prefix}" != NONE; then - kde_libraries=${exec_prefix}/lib - ac_kde_libraries=$exec_prefix/lib + if test "${kde_exec_prefix}" != NONE; then + kde_libraries=${kde_exec_prefix}/lib + ac_kde_libraries=$kde_exec_prefix/lib else - kde_libraries=${prefix}/lib - ac_kde_libraries=$prefix/lib + kde_libraries=${kde_prefix}/lib + ac_kde_libraries=$kde_prefix/lib fi else ac_kde_includes= @@ -35,7 +35,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde /usr/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="$kde_prefix/include /opt/kde2/include /usr/kde2/include /usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde /usr/include /opt/kde/include $x_includes $qt_includes" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE(ksock.h, $kde_incdirs, kde_incdir) @@ -47,7 +47,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /opt/kde/lib /usr/X11R6/kde/lib" +kde_libdirs="$kde_prefix/lib /opt/kde2/lib /usr/kde2/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /opt/kde/lib /usr/X11R6/kde/lib" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $kde_libdirs" AC_FIND_FILE(libkdecore.la, $kde_libdirs, kde_libdir) @@ -77,12 +77,12 @@ fi eval "$ac_cv_have_kde" if test "$have_kde" != "yes"; then - if test "${prefix}" = NONE; then + if test "${kde_prefix}" = NONE; then ac_kde_prefix="$ac_default_prefix" else - ac_kde_prefix="$prefix" + ac_kde_prefix="$kde_prefix" fi - if test "$exec_prefix" = NONE; then + if test "$kde_exec_prefix" = NONE; then ac_kde_exec_prefix="$ac_kde_prefix" AC_MSG_RESULT([will be installed in $ac_kde_prefix]) else diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4 index c4fa251..66b47c5 100644 --- a/conf/m4/kde/AC_CREATE_KFSSTND.m4 +++ b/conf/m4/kde/AC_CREATE_KFSSTND.m4 @@ -6,46 +6,46 @@ kde_result="" AC_CACHE_VAL(kde_cv_all_paths, [ if test -z "$kde_htmldir"; then - kde_htmldir='\$(prefix)/share/doc/HTML' + kde_htmldir='\$(kde_prefix)/share/doc/HTML' fi if test -z "$kde_appsdir"; then - kde_appsdir='\$(prefix)/share/applnk' + kde_appsdir='\$(kde_prefix)/share/applnk' fi if test -z "$kde_icondir"; then - kde_icondir='\$(prefix)/share/icons' + kde_icondir='\$(kde_prefix)/share/icons' fi if test -z "$kde_sounddir"; then - kde_sounddir='\$(prefix)/share/sounds' + kde_sounddir='\$(kde_prefix)/share/sounds' fi if test -z "$kde_datadir"; then - kde_datadir='\$(prefix)/share/apps' + kde_datadir='\$(kde_prefix)/share/apps' fi if test -z "$kde_locale"; then - kde_locale='\$(prefix)/share/locale' + kde_locale='\$(kde_prefix)/share/locale' fi if test -z "$kde_cgidir"; then - kde_cgidir='\$(exec_prefix)/cgi-bin' + kde_cgidir='\$(kde_exec_prefix)/cgi-bin' fi if test -z "$kde_confdir"; then - kde_confdir='\$(prefix)/share/config' + kde_confdir='\$(kde_prefix)/share/config' fi if test -z "$kde_mimedir"; then - kde_mimedir='\$(prefix)/share/mimelnk' + kde_mimedir='\$(kde_prefix)/share/mimelnk' fi if test -z "$kde_toolbardir"; then - kde_toolbardir='\$(prefix)/share/toolbar' + kde_toolbardir='\$(kde_prefix)/share/toolbar' fi if test -z "$kde_wallpaperdir"; then - kde_wallpaperdir='\$(prefix)/share/wallpapers' + kde_wallpaperdir='\$(kde_prefix)/share/wallpapers' fi if test -z "$kde_bindir"; then - kde_bindir='\$(exec_prefix)/bin' + kde_bindir='\$(kde_exec_prefix)/bin' fi if test -z "$kde_servicesdir"; then - kde_servicesdir='\$(prefix)/share/services' + kde_servicesdir='\$(kde_prefix)/share/services' fi if test -z "$kde_servicetypesdir"; then - kde_servicetypesdir='\$(prefix)/share/servicetypes' + kde_servicetypesdir='\$(kde_prefix)/share/servicetypes' fi kde_cv_all_paths="kde_have_all_paths=\"yes\" \ @@ -89,8 +89,9 @@ else AC_MSG_RESULT($kde_result) fi +save_BINDIR=$bindir bindir=$kde_bindir - KDE_SUBST_PROGRAMS +bindir=$save_BINDIR ]) diff --git a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 index e32facc..128e6ef 100644 --- a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 +++ b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 @@ -10,7 +10,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, done IFS=$kde_save_IFS fi - kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs" + kde_default_bindirs="$kde_exec_prefix/bin $kde_prefix/bin $kde_default_bindirs" KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)]) @@ -37,7 +37,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` else - kde_libs_prefix='$(prefix)' + kde_libs_prefix='$(kde_prefix)' kde_libs_htmldir='$(kde_htmldir)' fi AC_SUBST(kde_libs_prefix) -- cgit v1.2.3