diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
| commit | b29a88760d18f56788e028cbdcf9f226727c7f45 (patch) | |
| tree | 3535f5e6bf860326fb70b78344b588fbf03e2694 /configure.in.in | |
| parent | 2cdbd87e392bb2fa15e9416c7202d5ab1275c9f8 (diff) | |
| download | koffice-b29a88760d18f56788e028cbdcf9f226727c7f45.tar.gz koffice-b29a88760d18f56788e028cbdcf9f226727c7f45.zip | |
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'configure.in.in')
| -rw-r--r-- | configure.in.in | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/configure.in.in b/configure.in.in index bec764e0..21699e04 100644 --- a/configure.in.in +++ b/configure.in.in @@ -182,9 +182,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.2 #endif ], - need_kde32_compat="no" + need_trinity2_compat="no" , - need_kde32_compat="yes" + need_trinity2_compat="yes" ) AC_COMPILE_IFELSE([ @@ -193,9 +193,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.3 #endif ], - need_kde33_compat="no" + need_trinity3_compat="no" , - need_kde33_compat="yes" + need_trinity3_compat="yes" ) AC_COMPILE_IFELSE([ @@ -204,9 +204,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.4 #endif ], - need_kde34_compat="no" + need_trinity4_compat="no" , - need_kde34_compat="yes" + need_trinity4_compat="yes" ) AC_COMPILE_IFELSE([ @@ -215,24 +215,24 @@ AC_COMPILE_IFELSE([ #error KDE 3.5.x (x < 2) #endif ], - need_kde351_compat="no" + need_trinity51_compat="no" , - need_kde351_compat="yes" + need_trinity51_compat="yes" ) CXXFLAGS="$kdeversion_save_CXXFLAGS" LIBS="$kdeversion_safe_LIBS" AC_LANG_RESTORE -if test "$need_kde32_compat" = "yes"; then +if test "$need_trinity2_compat" = "yes"; then AC_MSG_RESULT([KDE 3.2.x]) else - if test "$need_kde33_compat" = "yes"; then + if test "$need_trinity3_compat" = "yes"; then AC_MSG_RESULT([KDE 3.3.x]) else - if test "$need_kde34_compat" = "yes"; then + if test "$need_trinity4_compat" = "yes"; then AC_MSG_RESULT([KDE 3.4.x]) else - if test "$need_kde351_compat" = "yes"; then + if test "$need_trinity51_compat" = "yes"; then AC_MSG_RESULT([KDE 3.5.x (x < 2)]) else AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk]) @@ -241,13 +241,13 @@ else fi fi -AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes") -AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes") -AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes") -AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes") +AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes") +AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes") +AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes") +AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes") # Keep the old KDE 3.1 test, as long as it is still used -AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no") +AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no") # --- End KDE 3.2 check --- |