mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
some more configure/Makefile changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3636 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
9c2fef3e5b
commit
81753592d8
@ -511,9 +511,9 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
|
||||
dnl Usage LYX_PATH_XPM: Checks for xpm library and header
|
||||
AC_DEFUN(LYX_PATH_XPM,[
|
||||
### Check for Xpm library
|
||||
AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,LYX_LIBS="-lXpm $LYX_LIBS",
|
||||
[LYX_LIB_ERROR(libXpm,Xpm)], $LYX_LIBS)
|
||||
|
||||
AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,XPM_LIB="-lXpm",
|
||||
[LYX_LIB_ERROR(libXpm,Xpm)], $XPM_LIB)
|
||||
AC_SUBST(XPM_LIB)
|
||||
### Check for Xpm headers
|
||||
lyx_cv_xpm_h_location="<xpm.h>"
|
||||
AC_CHECK_HEADER(X11/xpm.h,[
|
||||
@ -562,10 +562,10 @@ fi])
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
### Check for xforms library
|
||||
AC_CHECK_LIB(forms, fl_initialize, LYX_LIBS="-lforms $LYX_LIBS",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, LYX_LIBS="-lxforms $LYX_LIBS",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $LYX_LIBS)], $LYX_LIBS)
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XFORMS_LIB)], $XFORMS_LIB)
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
|
||||
30
configure.in
30
configure.in
@ -186,9 +186,17 @@ dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
|
||||
case "$lyx_use_frontend" in
|
||||
xforms)
|
||||
# for now don't set it for xforms as this is always entered
|
||||
LYX_PATH_XPM
|
||||
LYX_PATH_XFORMS
|
||||
FRONTEND="xforms"
|
||||
FRONTEND_GUILIB="xforms/*.lo"
|
||||
FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
|
||||
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
|
||||
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@"
|
||||
FRONTEND_INFO=`cat <<EOF
|
||||
libXpm version: ${XPM_VERSION}\n\
|
||||
libforms version: ${XFORMS_VERSION}\n
|
||||
`
|
||||
;;
|
||||
gnome)
|
||||
AM_PATH_GTKMM(1.2.1,,
|
||||
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
|
||||
@ -223,18 +231,18 @@ dnl Ensure gnome-config is available...
|
||||
esac
|
||||
|
||||
### Check for xforms and xpm (only if X has been found).
|
||||
if test "$have_x" = yes ; then
|
||||
if test "$have_x" = no ; then
|
||||
# We surely need these two libraries and want to check carefully the
|
||||
# version numbers...
|
||||
LYX_PATH_XPM
|
||||
LYX_PATH_XFORMS
|
||||
FRONTEND_INFO=`cat <<EOF
|
||||
libXpm version: ${XPM_VERSION}\n\
|
||||
libforms version: ${XFORMS_VERSION}\n
|
||||
`
|
||||
|
||||
AC_SUBST(LYX_LIBS)
|
||||
else
|
||||
#LYX_PATH_XPM
|
||||
#LYX_PATH_XFORMS
|
||||
#FRONTEND_INFO=`cat <<EOF
|
||||
# libXpm version: ${XPM_VERSION}\n\
|
||||
# libforms version: ${XFORMS_VERSION}\n
|
||||
#`
|
||||
#
|
||||
#AC_SUBST(LYX_LIBS)
|
||||
#else
|
||||
LYX_ERROR(dnl
|
||||
[Cannot find X window libraries and/or headers. Check your installation.
|
||||
If you use a Linux system, check that you have installed
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
AUTOMAKE_OPTIONS = foreign 1.4
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
|
||||
ETAGS_ARGS = --lang=c++
|
||||
|
||||
noinst_LTLIBRARIES = libqt2.la
|
||||
|
||||
BOOST_INCLUDES = -I$(top_srcdir)/boost
|
||||
SUBDIRS=xforms ui moc
|
||||
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
|
||||
@ -8,15 +12,11 @@ INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
|
||||
-I$(top_srcdir)/src/frontends/controllers
|
||||
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
|
||||
|
||||
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
|
||||
|
||||
LIBS=
|
||||
ETAGS_ARGS = --lang=c++
|
||||
|
||||
include Makefile.dialogs
|
||||
|
||||
ETAGS_ARGS = --lang=c++
|
||||
|
||||
libqt2_la_LIBADD = \
|
||||
xforms/libqt2xforms.la \
|
||||
ui/libqt2ui.la \
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
AUTOMAKE_OPTIONS = foreign 1.4
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
|
||||
|
||||
noinst_LTLIBRARIES = libqt2xforms.la
|
||||
|
||||
BOOST_INCLUDES = -I$(top_srcdir)/boost
|
||||
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
|
||||
${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
|
||||
-I$(top_srcdir)/src/frontends/controllers
|
||||
|
||||
DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
|
||||
|
||||
LIBS=
|
||||
ETAGS_ARGS = --lang=c++
|
||||
|
||||
XFORMS_SOURCES = \
|
||||
libqt2xforms_la_SOURCES = \
|
||||
bmtable.h \
|
||||
bmtable.c \
|
||||
combox.h \
|
||||
@ -85,10 +86,9 @@ XFORMS_SOURCES = \
|
||||
xforms_helpers.h \
|
||||
xforms_helpers.C
|
||||
|
||||
$(XFORMS_SOURCES):
|
||||
for i in $(XFORMS_SOURCES); do ln -sf "${top_srcdir}/src/frontends/xforms/$$i" . ; done
|
||||
libqt2xforms.la: link_files $(XFORMS_SOURCES)
|
||||
|
||||
ETAGS_ARGS = --lang=c++
|
||||
|
||||
libqt2xforms_la_SOURCES = \
|
||||
$(XFORMS_SOURCES)
|
||||
link_files:
|
||||
for i in $(XFORMS_SOURCES); do \
|
||||
ln -sf "${top_srcdir}/src/frontends/xforms/$$i" . ; \
|
||||
done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user