Changeset 3af3ca in git

Timestamp:

Oct 13, 2011, 4:24:47 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

4df5bdf2bfc58ff557a17588fb30694405784655

Parents:

4f7f4469ecb607b0fb7ebb1896b92f388634d796

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-10-13 16:24:47+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:14:00+01:00

Message:

FIX: public factory config.h should have ifndef/define/endif guards!

Files:

• factory/.gitignore (modified) (1 diff)
• factory/Makefile.am (modified) (1 diff)
• factory/configure.ac (modified) (1 diff)
• factory/factoryconf.template (modified) (1 diff)
• m4/ax_prefix_config_h.m4 (modified) (10 diffs)

factory/.gitignore

@@ -1 @@
-_configs.sed
 cplusplus
 cplusplus.h

factory/Makefile.am

@@ -330 +330 @@
 ##
 
-DISTCLEANFILES=_configs.sed factory_config.h
+# DISTCLEANFILES=_configs.sed factory_config.h

factory/configure.ac

@@ -23 +23 @@
 
 # Add pre'prefixed config
-AX_PREFIX_CONFIG_H([factory_config.h], [__FACTORY], [config.h])
+AX_PREFIX_CONFIG_H([config.h],[],[config.h])
 
 AC_PROG_YACC

factory/factoryconf.template

@@ -21 +21 @@
 /*MAKEHEADER*/
 #include "config.h"
-/* #include "factory_config.h" */
 
 /*MAKEHEADER*/

m4/ax_prefix_config_h.m4

@@ -5 +5 @@
 # SYNOPSIS
 #
-#   AX_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])]
+#   AX_PREFIX_CONFIG_H (OUTPUT-HEADER, PREFIX [,ORIG-HEADER])
 #
 # DESCRIPTION
@@ -24 +24 @@
 #   Defaults:
 #
-#     OUTPUT-HEADER = $PACKAGE-config.h
-#     PREFIX = $PACKAGE
 #     ORIG-HEADER, from AM_CONFIG_HEADER(config.h)
 #
@@ -37 +35 @@
 #     AM_INIT_AUTOMAKE(testpkg, 0.1.1)    # makes #undef VERSION and PACKAGE
 #     AM_CONFIG_HEADER(config.h)          # prep config.h from config.h.in
-#     AX_PREFIX_CONFIG_H(mylib/_config.h) # prep mylib/_config.h from it..
+#     AX_PREFIX_CONFIG_H(mylib/_config.h, TESTPKG_) # prep mylib/_config.h from it..
 #     AC_MEMORY_H                         # makes "#undef NEED_MEMORY_H"
 #     AC_C_CONST_H                        # makes "#undef const"
@@ -43 +41 @@
 #                                         # and also mylib/_config.h
 #
-#   if the argument to AX_PREFIX_CONFIG_H would have been omitted then the
-#   default outputfile would have been called simply "testpkg-config.h", but
-#   even under the name "mylib/_config.h" it contains prefix-defines like
+#   outputfile called "mylib/_config.h" contains prefix-defines like
 #
 #     #ifndef TESTPKG_VERSION
@@ -53 +49 @@
 #     #define TESTPKG_NEED_MEMORY_H 1
 #     #endif
-#     #ifndef _testpkg_const
-#     #define _testpkg_const _const
+#     #ifndef testpkg_const
+#     #define testpkg_const _const
 #     #endif
 #
@@ -70 +66 @@
 #
 #     #include <mylib/_config.h>
-#     #ifndef _testpkg_const
-#     #define _testpkg_const const
-#     #endif
-#
-#   and then start using _testpkg_const in the header files. That is also a
+#     #ifndef testpkg_const
+#     #define testpkg_const const
+#     #endif
+#
+#   and then start using testpkg_const in the header files. That is also a
 #   good thing to differentiate whether some library-user has starting to
 #   take up with a different compiler, so perhaps it could read something
@@ -84 +80 @@
 #     #include <mylib/_config.h>
 #     #endif
-#     #ifndef _testpkg_const
-#     #define _testpkg_const const
+#     #ifndef testpkg_const
+#     #define testpkg_const const
 #     #endif
 #
@@ -134 +130 @@
 m4_pushdef([_script],[conftest.prefix])dnl
 m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
+
 _OUT=`echo ifelse($1, , $PACKAGE-config.h, $1)`
-_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
-_PKG=`echo ifelse($2, , $PACKAGE, $2)`
-_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
+_PKG=`echo $2`
+_LOW=`echo $_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
 _UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`
 _INP=`echo "ifelse($3,,,$3)" | sed -e 's/ *//'`
+_DEF=`echo "$_UPP $PACKAGE $_OUT" | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
+
 if test ".$_INP" = "."; then
    for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
@@ -159 +157 @@
    esac
 fi
-if test -z "$_PKG" ; then
-   AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H])
-else
+#if test -z "$_PKG" ; then
+#   AC_MSG_ERROR([no prefix for AX_PREFIX_PKG_CONFIG_H])
+#else
   if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then
      _INP="$srcdir/$_INP"
   fi fi
-  AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
+  AC_MSG_NOTICE([creating '$_OUT' - prefix '$_UPP' for '$_INP' defines])
   if test -f $_INP ; then
-    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/"]) > _script
-    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/"]) >> _script
-    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1\\"]) >> _script
-    AS_ECHO(["@%:@def[]ine $_UPP""_\\1\\2\\"]) >> _script
+    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""\\1/"]) > _script
+    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""\\1/"]) >> _script
+    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""\\1\\"]) >> _script
+    AS_ECHO(["@%:@def[]ine $_UPP""\\1\\2\\"]) >> _script
     AS_ECHO(["@%:@endif/"]) >> _script
-    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1\\"]) >> _script
-    AS_ECHO(["@%:@define $_LOW""_\\1\\2\\"]) >> _script
+    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""\\1\\"]) >> _script
+    AS_ECHO(["@%:@define $_LOW""\\1\\2\\"]) >> _script
     AS_ECHO(["@%:@endif/"]) >> _script
     # now executing _script on _DEF input to create _OUT output file
@@ -194 +192 @@
     fi
     cp _script _configs.sed
+    rm _configs.sed
   else
     AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT])
   fi
   rm -f conftest.*
-fi
+#fi
 m4_popdef([_symbol])dnl
 m4_popdef([_script])dnl