From 5ef73a536487fcc0487a86b71deb8536d75212d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 12 Jun 2000 12:52:51 +0000 Subject: [PATCH] small things git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@809 a592a061-630c-0410-9148-cb99ea01b6c8 --- acinclude.m4 | 15 ++++++++++++--- src/insets/ExternalTemplate.C | 1 + src/layout_forms.h | 2 -- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index fd73e8cfb3..6b5a3602ca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,7 @@ dnl Some useful functions for LyXs configure.in -*- sh -*- dnl Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) dnl Lars Gullik Bjønnes (larsbj@lyx.org) +dnl Allan Rae (rae@lyx.org) dnl Usage LYX_GET_VERSION Sets "lyx_version" to the version of LyX being @@ -735,21 +736,29 @@ AC_SUBST(INCLUDED_SIGC) ## actual header _is_ found though and the cache variable is set however ## the reported setting (on screen) is equal to $ac_safe for some unknown ## reason. +## Additionally, autoheader can't figure out what to use as the name in +## the config.h.in file so we need to write our own entries there -- one for +## each header in the form PATH_HEADER_NAME_H +## AC_DEFUN(LYX_PATH_HEADER, [ AC_CHECK_HEADER($1,[ ac_tr_safe=PATH_`echo $ac_safe | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - AC_CACHE_CHECK([path to $1],lyx_cv_path_$ac_safe, +### the only remaining problem is getting the second parameter to this +### AC_CACHE_CACHE to print correctly. Currently it just results in value +### of $ac_safe being printed. + AC_CACHE_CHECK([path to $1],[lyx_cv_path2_$ac_safe], [ cat > conftest.$ac_ext < EOF -lyx_cv_path_$ac_safe=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ +lyx_path_header_path=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ grep $1 2>/dev/null | \ sed -e 's/.*\(".*$1"\).*/\1/' -e "1q"` +eval "lyx_cv_path2_${ac_safe}=\$lyx_path_header_path" rm -f conftest*]) - AC_DEFINE_UNQUOTED(${ac_tr_safe},${lyx_cv_path_$ac_safe})]) + AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path)]) ]) ### end of LYX_PATH_HEADER diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C index 34e3386d2c..7a4391a817 100644 --- a/src/insets/ExternalTemplate.C +++ b/src/insets/ExternalTemplate.C @@ -20,6 +20,7 @@ #include "lyxlex.h" #include "support/path.h" +#include "support/LAssert.h" using std::endl; using std::ostream; diff --git a/src/layout_forms.h b/src/layout_forms.h index b310459f60..4a229f4944 100644 --- a/src/layout_forms.h +++ b/src/layout_forms.h @@ -125,8 +125,6 @@ typedef struct { FL_OBJECT *choice_bar; FL_OBJECT *button_apply; FL_OBJECT *button_close; - FL_OBJECT *choice_color; - FL_OBJECT *check_toggle_all; } FD_form_character; extern FD_form_character * create_form_form_character(void); -- 2.39.5