[Libreoffice-commits] .: 3 commits - configure.in set_soenv.in soltools/mkdepend

[Michael Meeks]

 configure.in                 |   17 +++++++++++++++++
 set_soenv.in                 |    1 +
 soltools/mkdepend/def.h      |   16 +++++++++-------
 soltools/mkdepend/ifparser.h |    2 +-
 soltools/mkdepend/include.c  |    1 +
 5 files changed, 29 insertions(+), 8 deletions(-)

New commits:
commit c7453d7ee28151da5d83cf7675559d6063cbacef
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Apr 26 14:56:55 2011 +0100

    hush unused parameter error

diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index bdd3d3b..844c99b 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -56,6 +56,7 @@ struct inclist *inc_path(file, include, dot, incCollection)
     register struct inclist	*ip;
     struct stat	st;
     boolean	found = FALSE;
+    (void)dot;
 
     /*
      * Check all previously found include files for a path that
commit 90fe4451f0a0c15f47b3f95db5899c83699144f8
Author: Cyril Roelandt <tipecaml at gmail.com>
Date:   Tue Apr 26 08:44:57 2011 +0200

    Fixing prototypes in soltools/mkdepend/ .

diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 472eb60..b8a6659 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -153,13 +153,15 @@ char			*malloc();
 char			*realloc();
 #endif
 
-char			*copy();
-char			*base_name();
-char			*get_line();
-char			*isdefined();
-struct filepointer	*getfile();
-struct inclist		*newinclude();
-struct inclist		*inc_path();
+char			*copy(char *);
+char			*base_name(char *);
+char			*get_line(struct filepointer *);
+char			*isdefined(char *);
+struct filepointer	*getfile(char *);
+struct inclist *newinclude(register char *newfile,
+                           register char *incstring);
+struct inclist		*inc_path(char *, char *, boolean,
+                                  struct IncludesCollection *);
 
 void define( char *def, struct symhash **symbols );
 void hash_define(char *name, char * val, struct symhash **symbols);
diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h
index 316cdca..936f0ba 100644
--- a/soltools/mkdepend/ifparser.h
+++ b/soltools/mkdepend/ifparser.h
@@ -72,6 +72,6 @@ typedef struct _if_parser {
     char *data;
 } IfParser;
 
-const char *ParseIfExpression (/* IfParser *, const char *, int * */);
+const char *ParseIfExpression (IfParser *, const char *, int *);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ab4baa343a6fdd5496a4a2a99ec50a1f711ad0bd
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Apr 26 14:54:10 2011 +0100

    initial uglification

diff --git a/configure.in b/configure.in
index 47f6190..7419fd4 100755
--- a/configure.in
+++ b/configure.in
@@ -358,6 +358,12 @@ AC_ARG_ENABLE(binfilter,
 ,enable_binfilter=no
 )
 
+AC_ARG_ENABLE(ugly,
+    AS_HELP_STRING([--enable-ugly],
+        [Enables ugly pieces of functionality.]),
+,enable_ugly=no
+)
+
 AC_ARG_ENABLE(rpath,
     AS_HELP_STRING([--disable-rpath],
         [Disable the use of relative paths in shared libraries.]),
@@ -1729,6 +1735,17 @@ else
 fi
 AC_SUBST(WITH_BINFILTER)
 
+dnl Enable ugly pieces of code we're better off without
+dnl ===================================================================
+if test "$enable_ugly" = "yes"; then
+  BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
+  SCPDEFS="$SCPDEFS -DWITH_UGLY"
+  ENABLE_UGLY=YES
+else
+  ENABLE_UGLY=NO
+fi
+AC_SUBST(ENABLE_UGLY)
+
 dnl ===================================================================
 dnl Disable rpath in shared libraries?
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 833c237..fc010b0 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1788,6 +1788,7 @@ ToFile( "BUILD_TYPE",        "$BUILD_TYPE",       "e" );
 ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
 ToFile( "ENABLE_ZENITY",           "@ENABLE_ZENITY@",          "e" );
 ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
+ToFile( "ENABLE_UGLY",       "@ENABLE_UGLY@",      "e" );
 ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
 ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {