fwbuilder-modulesdir.patch

   1 --- fwbuilder-1.0.10/src/gui/DialogFactory.cc.orig      Sun Jan 26 06:33:22 2003
   2 +++ fwbuilder-1.0.10/src/gui/DialogFactory.cc   Wed Jul 23 16:01:23 2003
   3 @@ -206,7 +206,7 @@
   4              return( new TargetDialog_unknown(o) );
   5          } else
   6          {
   7 -            string mod_path=TEMPLATE_DIR "/modules/gui/lib_" +
   8 +            string mod_path=MODULES_DIR "/modules/gui/lib_" +
   9                 target + "_dlg." DYNAMIC_MODULE_EXT;
  10
  11              void *handle;
  12 --- fwbuilder-1.0.10/src/ipt/Makefile.in.orig   Wed Jul 23 16:02:46 2003
  13 +++ fwbuilder-1.0.10/src/ipt/Makefile.in        Wed Jul 23 16:02:27 2003
  14 @@ -19,8 +19,8 @@
  15  datadir = @datadir@
  16  localedir = $(datadir)/locale
  17
  18 -gui_modules_dir = @datadir@/fwbuilder/modules/gui
  19 -be_modules_dir = @datadir@/fwbuilder/modules/backend
  20 +gui_modules_dir = @libdir@/fwbuilder/modules/gui
  21 +be_modules_dir = @libdir@/fwbuilder/modules/backend
  22
  23  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  24
  25 --- fwbuilder-1.0.10/src/pf/Makefile.in.orig    Wed Apr 30 08:52:26 2003
  26 +++ fwbuilder-1.0.10/src/pf/Makefile.in Wed Jul 23 16:03:09 2003
  27 @@ -18,8 +18,8 @@
  28  datadir = @datadir@
  29  localedir = $(datadir)/locale
  30
  31 -gui_modules_dir = @datadir@/fwbuilder/modules/gui
  32 -be_modules_dir = @datadir@/fwbuilder/modules/backend
  33 +gui_modules_dir = @libdir@/fwbuilder/modules/gui
  34 +be_modules_dir = @libdir@/fwbuilder/modules/backend
  35
  36
  37
  38 --- fwbuilder-1.0.10/src/pix/Makefile.in.orig   Wed Apr 30 08:52:27 2003
  39 +++ fwbuilder-1.0.10/src/pix/Makefile.in        Wed Jul 23 16:03:22 2003
  40 @@ -16,8 +16,8 @@
  41  docdir = @DOCDIR@
  42  datadir = @datadir@/fwbuilder
  43
  44 -gui_modules_dir = @datadir@/fwbuilder/modules/gui
  45 -be_modules_dir = @datadir@/fwbuilder/modules/backend
  46 +gui_modules_dir = @libdir@/fwbuilder/modules/gui
  47 +be_modules_dir = @libdir@/fwbuilder/modules/backend
  48
  49
  50
  51 --- fwbuilder-1.1.2/configure.in.orig   2003-12-19 08:17:33.000000000 +0100
  52 +++ fwbuilder-1.1.2/configure.in        2004-06-06 00:55:56.882542056 +0200
  53 @@ -37,7 +37,7 @@
  54  AC_SUBST(FWB_VERSION)
  55
  56  AC_SUBST(RELEASE_NUM)
  57 -AC_DEFINE_UNQUOTED(RELEASE_NUM, "$RELEASE_NUM")
  58 +AC_DEFINE_UNQUOTED(RELEASE_NUM, "$RELEASE_NUM", [package release])
  59
  60  AC_SUBST(REQUIRED_LIBFWBUILDER_VERSION)
  61  AC_SUBST(LIBFWBUILDER_SOMAJOR)
  62 @@ -47,7 +47,7 @@
  63
  64
  65  PACKAGE=fwbuilder
  66 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
  67 +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [package name])
  68  AC_SUBST(PACKAGE)
  69
  70  AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
  71 @@ -98,6 +98,7 @@
  72
  73
  74  AC_ARG_WITH(templatedir, [  --with-templatedir=DIR  Specify directory path for fwbuilder template files ])
  75 +AC_ARG_WITH(modulesdir,  [  --with-modulesdir=DIR   Specify directory path for fwbuilder modules ])
  76  AC_ARG_WITH(iconsdir,    [  --with-iconsdir=DIR     Specify directory path for icons ])
  77  AC_ARG_WITH(docdir,      [  --with-docdir=DIR       Specify directory path for fwbuilder
  78                            documentation files  ])
  79 @@ -120,12 +121,18 @@
  80  dnl   path
  81
  82  if test "x$with_templatedir" != "x"; then
  83 -  AC_DEFINE_UNQUOTED(TEMPLATE_DIR, "${with_templatedir}")
  84 +  AC_DEFINE_UNQUOTED(TEMPLATE_DIR, "${with_templatedir}", [template directory])
  85  else
  86 -  AC_DEFINE_UNQUOTED(TEMPLATE_DIR, "${PREFIX}/share/fwbuilder")
  87 +  AC_DEFINE_UNQUOTED(TEMPLATE_DIR, "${PREFIX}/share/fwbuilder", [template directory])
  88  fi
  89
  90 -AC_DEFINE_UNQUOTED(VERSION,              "$VERSION")
  91 +if test "x$with_modulesdir" != "x"; then
  92 +  AC_DEFINE_UNQUOTED(MODULES_DIR, "${with_modulesdir}", [modules directory])
  93 +else
  94 +  AC_DEFINE_UNQUOTED(MODULES_DIR, "${PREFIX}/lib/fwbuilder", [modules directory])
  95 +fi
  96 +
  97 +AC_DEFINE_UNQUOTED(VERSION,              "$VERSION", [package version])
  98  AC_SUBST(VERSION)
  99
 100  if test "x$with_iconsdir" != "x"; then
 101 @@ -158,7 +165,7 @@
 102  AC_MSG_CHECKING(whether we should define __PRAGMA_REDEFINE_EXTNAME)
 103  case "$build_os" in
 104    solaris*)
 105 -    AC_DEFINE_UNQUOTED(__PRAGMA_REDEFINE_EXTNAME, 1)
 106 +    AC_DEFINE_UNQUOTED(__PRAGMA_REDEFINE_EXTNAME, 1, [extname])
 107      AC_MSG_RESULT(yes)
 108      ;;
 109    *)
 110 @@ -169,11 +176,11 @@
 111  AC_MSG_CHECKING(the file extension of the dynamically loadable modules)
 112  case "$build_os" in
 113    *darwin*)
 114 -    AC_DEFINE_UNQUOTED(DYNAMIC_MODULE_EXT, "dylib")
 115 +    AC_DEFINE_UNQUOTED(DYNAMIC_MODULE_EXT, "dylib", [dynamic module extension])
 116      AC_MSG_RESULT(dylib)
 117      ;;
 118    *)
 119 -    AC_DEFINE_UNQUOTED(DYNAMIC_MODULE_EXT, "so")
 120 +    AC_DEFINE_UNQUOTED(DYNAMIC_MODULE_EXT, "so", [dynamic module extension])
 121      AC_MSG_RESULT(so)
 122      ;;
 123  esac
 124 @@ -190,7 +197,7 @@
 125  dnl     ;;
 126  dnl esac
 127
 128 -AC_DEFINE_UNQUOTED(EXTERNAL_FUNC_NAME_PREFIX, )
 129 +AC_DEFINE_UNQUOTED(EXTERNAL_FUNC_NAME_PREFIX, , [function name prefix])
 130
 131  AC_ARG_ENABLE(libfwbuilder-check, [  --disable-libfwbuilder-check   Internal: used to regenerate fwbuilder build environment when libfwbuilder is not installed (yet)],
 132           [CHECK_LIBFWBUILDER="no"], [CHECK_LIBFWBUILDER="yes"])
 133 @@ -281,7 +288,7 @@
 134  fi
 135  fi
 136
 137 -AC_DEFINE_UNQUOTED(LIBFWBUILDER_VERSION, "$LIBFWBUILDER_VERSION")
 138 +AC_DEFINE_UNQUOTED(LIBFWBUILDER_VERSION, "$LIBFWBUILDER_VERSION", [libfwbuilder version])
 139
 140  dnl TODO: remove this once we get rid of the old iptables compiler
 141  dnl  all other modules do not need separate GLIB_CFLAGS and GLIB_LIBS
 142 @@ -462,7 +469,7 @@
 143     ofstream strm(1);
 144  ,
 145    AC_MSG_RESULT(yes)
 146 -  AC_DEFINE_UNQUOTED(STL_HAS_OFSTREAM_FD, 1)
 147 +  AC_DEFINE_UNQUOTED(STL_HAS_OFSTREAM_FD, 1, [have ofstream fd])
 148  ,
 149    AC_MSG_RESULT(no)
 150  )
 151 @@ -478,7 +485,7 @@
 152     dlopen("",RTLD_LAZY);
 153  ,
 154    AC_MSG_RESULT(yes)
 155 -  AC_DEFINE_UNQUOTED(DLOPEN_MODE, RTLD_LAZY)
 156 +  AC_DEFINE_UNQUOTED(DLOPEN_MODE, RTLD_LAZY, [dlopen mode])
 157  ,
 158    AC_MSG_RESULT(no)
 159
 160 @@ -489,7 +496,7 @@
 161     dlopen("",DL_LAZY);
 162  ,
 163      AC_MSG_RESULT(yes)
 164 -    AC_DEFINE_UNQUOTED(DLOPEN_MODE, DL_LAZY)
 165 +    AC_DEFINE_UNQUOTED(DLOPEN_MODE, DL_LAZY, [dlopen mode])
 166  ,
 167      AC_MSG_RESULT(no)
 168      AC_MSG_ERROR([Can not determine valid value for the second parameter for dlopen])
 169 @@ -690,16 +697,16 @@
 170  DOCDIRPATH=`dirname ${DOCDIR}`
 171
 172  AC_SUBST(OS)
 173 -AC_DEFINE_UNQUOTED(OS,               "${OS}")
 174 +AC_DEFINE_UNQUOTED(OS,               "${OS}", [package OS])
 175
 176  AC_SUBST(DISTRO)
 177 -AC_DEFINE_UNQUOTED(DISTRO,           "${DISTRO}")
 178 +AC_DEFINE_UNQUOTED(DISTRO,           "${DISTRO}", [package distro])
 179
 180  AC_SUBST(DOCDIRPATH)
 181 -AC_DEFINE_UNQUOTED(DOCDIRPATH,       "${DOCDIRPATH}")
 182 +AC_DEFINE_UNQUOTED(DOCDIRPATH,       "${DOCDIRPATH}", [doc dir path])
 183
 184  AC_SUBST(DOCDIR)
 185 -AC_DEFINE_UNQUOTED(DOCDIR,           "${DOCDIR}")
 186 +AC_DEFINE_UNQUOTED(DOCDIR,           "${DOCDIR}", [doc dir])
 187
 188  AC_SUBST(MANDIR)
 189