* FPCAPACHE_1_13 or FPCAPACHE_2_0 define will determine what Apache version is taken

git-svn-id: trunk@9589 -

compiler/utils/fpccfg.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const DefaultConfig : array[0..23] of string[240]=(
+const DefaultConfig : array[0..24] of string[240]=(
 {$else Delphi}
-const DefaultConfig : array[0..23,1..240] of char=(
+const DefaultConfig : array[0..24,1..240] of char=(
 {$endif Delphi}
   '#'#010+
   '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#010+
@@ -151,13 +151,23 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# searchpath for objectfiles'#010+
   '#-Fo%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#010+
   #010+
+  '#IFDEF FPCAPACHE_1_13'#010+
+  '-Fu%basepath%/units/$FPCTARGET/httpd-1.3/'#010+
+  '#ELSE'#010+
+  '#IFDEF FPCAPACHE_2_0'#010+
+  '-Fu%basepath%/units/$FPCTARGET/httpd-2.0'#010+
+  '#ELSE'#010+
+  '-Fu%basepath%/u','nits/$FPCTARGET/httpd-2.2'#010+
+  '#ENDIF'#010+
+  '#ENDIF'#010+
+  #010+
   '# searchpath for units and other system dependent things'#010+
   '-Fu%basepath%/units/$FPCTARGET/'#010+
   '-Fu%basepath%/units/$FPCTARGET/*'#010+
-  '-Fu%basepath%/units/$FPCTARGET/','rtl'#010+
+  '-Fu%basepath%/units/$FPCTARGET/rtl'#010+
   #010+
   '# searchpath for libraries'#010+
-  '#-Fl%basepath%/lib'#010+
+  '#-Fl%basepath%','/lib'#010+
   '#-Fl/lib;/usr/lib'#010+
   #010+
   '# searchpath for tools'#010+
@@ -171,23 +181,24 @@ const DefaultConfig : array[0..23,1..240] of char=(
   #010+
   '# -------------'#010+
   '# Linking'#010+
-  '#',' -------------'#010+
+  '# -------------'#010+
   #010+
-  '# generate always debugging information for GDB (slows down the compil'+
-  'ing'#010+
+  '# generate always debugging in','formation for GDB (slows down the comp'+
+  'iling'#010+
   '# process)'#010+
   '#      -gc        generate checks for pointers'#010+
   '#      -gd        use dbx'#010+
   '#      -gg        use gsym'#010+
-  '#      -gh        use heap trace unit (','for memory leak debugging)'#010+
-  '#      -gl        use line info unit to show more info for backtraces'#010+
+  '#      -gh        use heap trace unit (for memory leak debugging)'#010+
+  '#      -gl        u','se line info unit to show more info for backtrace'+
+  's'#010+
   '#      -gv        generates programs tracable with valgrind'#010+
   '#      -gw        generate dwarf debugging info'#010+
   '#'#010+
-  '# Enable debuginfo and use the li','ne info unit by default'#010+
+  '# Enable debuginfo and use the line info unit by default'#010+
   '#-gl'#010+
   #010+
-  '# always pass an option to the linker'#010+
+  '# always pass an',' option to the linker'#010+
   '#-k-s'#010+
   #010+
   '# Always strip debuginfo from the executable'#010+
@@ -202,18 +213,18 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '-l'#010+
   #010+
   '# Verbosity'#010+
-  '#      e : Show',' errors (default)       d : Show debug info'#010+
-  '#      w : Show warnings               u : Show unit info'#010+
+  '#      e : Show errors (default)       d : Show debug info'#010+
+  '# ','     w : Show warnings               u : Show unit info'#010+
   '#      n : Show notes                  t : Show tried/used files'#010+
   '#      h : Show hints                  m : Show defined macros'#010+
-  '#      i :',' Show general info           p : Show compiled procedures'#010+
+  '#      i : Show general info           p : Show compiled',' procedures'#010+
   '#      l : Show linenumbers            c : Show conditionals'#010+
   '#      a : Show everything             0 : Show nothing (except errors'+
   ')'#010+
-  '#      b : Show all procedure          r : Rhide/','GCC compatibility m'+
-  'ode'#010+
-  '#          declarations if an error    x : Executable info (Win32 only'+
-  ')'#010+
+  '#      b : Show all procedure          r : Rhide/GCC compatibility mod'+
+  'e'#010+
+  '#          declarations',' if an error    x : Executable info (Win32 on'+
+  'ly)'#010+
   '#          occurs'#010+
   '#'#010+
   '# Display Info, Warnings, Notes and Hints'#010+