small things

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@809 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/acinclude.m4 b/acinclude.m4
index fd73e8cfb325e7f2c9f3385e4e066d7098ff50f1..6b5a3602ca75285d34afd41b0e4b67b12cda6133 100644 (file)
--- 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
 #line __oline__ "configure"
 #include "confdefs.h"
 
 #include <$1>
 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 34e3386d2c44b069f6e2f4cb74a3a14b2d2609f6..7a4391a8175aadd226b311f66833bb7ea31ae66a 100644 (file)
--- 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 b310459f6008b78f6d6033e89c9b0ca3fc3fa52c..4a229f4944ea24c4d7da5fdc0e8fb9e0d33dca69 100644 (file)
--- 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);