Attachment #223401 for bug #305311




             with_kde4_incl=${withval})
  dnl make sure the path is a useable one
  if test x"${with_kde4_incl}" != x ; then
    if test ! -f ${with_kde4_incl}/kapplication.h ; then
      AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
    fi
  fi

             with_kde4_lib=${withval})
  dnl make sure the path is a useable one
  if test x"${with_kde4_lib}" != x ; then 
    if test ! -f ${with_kde4_lib}/libkdeui.so; then
      AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
    fi
  fi

    dnl Look for the libraries
    AC_CACHE_VAL(ac_cv_path_kde4_lib, [
      if test x"${with_kde4_lib}" != x ; then
        if test -f ${with_kde4_lib}/libkdeui.so; then
	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
        else
	        AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])

        AC_MSG_CHECKING([for kdeui library])
        kde4_topdir=
        for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
            kde4_topdir=$i
            AC_MSG_RESULT(${kde4_topdir}/libkdeui)
	          if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then

         AC_MSG_RESULT(no)
        fi
      fi
      dnl Look for the kdeprint library, which is required
      AC_MSG_CHECKING([for kdeprint library])
      if test x"${libkdeprint}" = x; then
        if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
          ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
          AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
        else
          AC_MSG_RESULT(no)
        fi
      else
        AC_MSG_RESULT(${libkdeprint})
        ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
      fi	
    ])                  dnl end of cache ac_cv_path_kde4_lib
  fi                    dnl end of build_kde4


    KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
    KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
    KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
    KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
  fi                            dnl end of build_kparts4

  if test x"${ac_cv_path_kde4_incl}" != x ; then

  fi                            dnl end of build_kparts4

  if test x"${ac_cv_path_kde4_incl}" != x ; then
    if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
      KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
    else
      KDE4_CFLAGS=""

Lines 42-47 libklashpart_la_LDFLAGS = -avoid-version Link Here

(-)gnash-0.8.5/plugin/klash4/Makefile.am.alt-kde4 (+1 lines)
42	else	39	else
43	libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)	40	libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
44	endif	41	endif
		42	libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS) $(X11_LIBS) -lkparts
45		43
46	dist_kde_services_DATA = klash_part.desktop	44	dist_kde_services_DATA = klash_part.desktop
47	dist_kde_rc_DATA = klashpartui.rc	45	dist_kde_rc_DATA = klashpartui.rc

Lines 1-7 Link Here

(-)gnash-0.8.5/plugin/klash4/pluginsinfo.alt-kde4 (-1 / +1 lines)
1	number=1	1	number=1
2		2
3	[0]	3	[0]
4	description=Shockwave Flash 7.0	4	description=Shockwave Flash 10.1 r999
5	file=libklashpart.so	5	file=libklashpart.so
6	mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player	6	mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
7	name=Shockwave Flash	7	name=Shockwave Flash

Return to bug 305311

Lines 24-30 AC_DEFUN([GNASH_PATH_KDE4], Link Here

(-)gnash-0.8.5/macros/kde4.m4.alt-kde4 (-19 / +6 lines)
24	with_kde4_incl=${withval})	24	with_kde4_incl=${withval})
25	dnl make sure the path is a useable one	25	dnl make sure the path is a useable one
26	if test x"${with_kde4_incl}" != x ; then	26	if test x"${with_kde4_incl}" != x ; then
27	if test ! -f ${with_kde4_incl}/kapp.h ; then	27	if test ! -f ${with_kde4_incl}/kapplication.h ; then
28	AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])	28	AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
29	fi	29	fi
30	fi	30	fi
Lines 38-44 AC_DEFUN([GNASH_PATH_KDE4], Link Here
38	with_kde4_lib=${withval})	38	with_kde4_lib=${withval})
39	dnl make sure the path is a useable one	39	dnl make sure the path is a useable one
40	if test x"${with_kde4_lib}" != x ; then	40	if test x"${with_kde4_lib}" != x ; then
41	if test ! -f ${with_kde4_lib}/libkdeui.la; then	41	if test ! -f ${with_kde4_lib}/libkdeui.so; then
42	AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])	42	AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
43	fi	43	fi
44	fi	44	fi
Lines 136-142 AC_DEFUN([GNASH_PATH_KDE4], Link Here
136	dnl Look for the libraries	136	dnl Look for the libraries
137	AC_CACHE_VAL(ac_cv_path_kde4_lib, [	137	AC_CACHE_VAL(ac_cv_path_kde4_lib, [
138	if test x"${with_kde4_lib}" != x ; then	138	if test x"${with_kde4_lib}" != x ; then
139	if test -f ${with_kde4_lib}/libkdeui.la; then	139	if test -f ${with_kde4_lib}/libkdeui.so; then
140	ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"	140	ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
141	else	141	else
142	AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])	142	AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
Lines 146-152 AC_DEFUN([GNASH_PATH_KDE4], Link Here
146	AC_MSG_CHECKING([for kdeui library])	146	AC_MSG_CHECKING([for kdeui library])
147	kde4_topdir=	147	kde4_topdir=
148	for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do	148	for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
149	if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then	149	if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
150	kde4_topdir=$i	150	kde4_topdir=$i
151	AC_MSG_RESULT(${kde4_topdir}/libkdeui)	151	AC_MSG_RESULT(${kde4_topdir}/libkdeui)
152	if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then	152	if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
Lines 169-187 AC_DEFUN([GNASH_PATH_KDE4], Link Here
169	AC_MSG_RESULT(no)	169	AC_MSG_RESULT(no)
170	fi	170	fi
171	fi	171	fi
172	dnl Look for the kdeprint library, which is required
173	AC_MSG_CHECKING([for kdeprint library])
174	if test x"${libkdeprint}" = x; then
175	if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
176	ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
177	AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
178	else
179	AC_MSG_RESULT(no)
180	fi
181	else
182	AC_MSG_RESULT(${libkdeprint})
183	ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
184	fi
185	]) dnl end of cache ac_cv_path_kde4_lib	172	]) dnl end of cache ac_cv_path_kde4_lib
186	fi dnl end of build_kde4	173	fi dnl end of build_kde4
187		174
Lines 201-207 Link Here
201	KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"	201	KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
202	KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"	202	KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
203	KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"	203	KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
204	KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"	204	KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
205	fi dnl end of build_kparts4	205	fi dnl end of build_kparts4
206		206
207	if test x"${ac_cv_path_kde4_incl}" != x ; then	207	if test x"${ac_cv_path_kde4_incl}" != x ; then
Lines 218-224 AC_DEFUN([GNASH_PATH_KDE4], Link Here
218	fi dnl end of build_kparts4	205	fi dnl end of build_kparts4
219		206
220	if test x"${ac_cv_path_kde4_incl}" != x ; then	207	if test x"${ac_cv_path_kde4_incl}" != x ; then
221	if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then	208	if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
222	KDE4_CFLAGS="${ac_cv_path_kde4_incl}"	209	KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
223	else	210	else
224	KDE4_CFLAGS=""	211	KDE4_CFLAGS=""