anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove setup of kde, fix the libtool setup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2103 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-06-11 20:53:18 +00:00
parent 358a19aca8
commit 4f816fd13b
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -24,7 +24,7 @@ fi
echo -n "Generate acinclude.m4... "
rm -f acinclude.m4 sigc++/acinclude.m4
touch acinclude.m4
for fil in config/lyxinclude.m4 config/libtool.m4 config/gettext.m4 config/lcmessage.m4 config/progtest.m4 config/sigc++.m4 config/kde.m4 config/qt2.m4 config/gtk--.m4 config/gnome--.m4 config/gnome.m4 config/pspell.m4; do
for fil in config/lyxinclude.m4 config/libtool.m4 config/gettext.m4 config/lcmessage.m4 config/progtest.m4 config/sigc++.m4 config/qt2.m4 config/gtk--.m4 config/gnome--.m4 config/gnome.m4 config/pspell.m4; do
cat $fil >> acinclude.m4
done
touch sigc++/acinclude.m4

36
config/lyxinclude.m4
View File

@ -985,3 +985,39 @@ if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
got="yes"
fi
done])
## ------------------------------------------------------------------------
## Find a file (or one of more files in a list of dirs)
## ------------------------------------------------------------------------
##
AC_DEFUN(AC_FIND_FILE,
[
$3=NO
for i in $2;
do
for j in $1;
do
if test -r "$i/$j"; then
$3=$i
break 2
fi
done
done
])
dnl just a wrapper to clean up configure.in
AC_DEFUN(LYX_PROG_LIBTOOL,
[
AC_REQUIRE([AC_ENABLE_SHARED])
AC_REQUIRE([AC_ENABLE_STATIC])
dnl libtool is only for C, so I must force him
dnl to find the correct flags for C++
ac_save_cc=$CC
ac_save_cflags="$CFLAGS"
CC=$CXX
CFLAGS="$CXXFLAGS"
AM_PROG_LIBTOOL dnl for libraries
CC=$ac_save_cc
CFLAGS="$ac_save_cflags"
])

14
configure.in
View File

@ -76,7 +76,8 @@ LYX_PROG_CXX
AC_PROG_CXXCPP
AC_DISABLE_SHARED
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
### Some checks on what the C++ compiler can(not) do
LYX_CXX_MUTABLE
@ -161,13 +162,6 @@ AC_CHECK_FUNCS(XOpenIM)
dnl The code below is not in a macro, because this would cause big
dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
case "$lyx_use_frontend" in
kde)
KDE_DO_IT_ALL
FRONTEND="kde"
FRONTEND_GUILIB="kde/libkde.la"
FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)"
FRONTEND_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)"
FRONTEND_LIBS="\$(KDE_LIBS)";;
xforms)
# for now don't set it for xforms as this is always entered
FRONTEND=""
@ -321,10 +315,6 @@ AC_OUTPUT([Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/qt2/Makefile \
src/frontends/kde/Makefile \
src/frontends/kde/moc/Makefile \
src/frontends/kde/dlg/Makefile \
src/frontends/kde/dlg/moc/Makefile \
src/frontends/gnome/Makefile \
], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])