From 59a791ced24be728b0f8c81e814f7c8ad9c4211f Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 7 Feb 2004 23:34:51 +0000
Subject: [PATCH] * Moved makefile options to jconfig.inc

---
 packages/base/pasjpeg/Makefile     | 1 -
 packages/base/pasjpeg/Makefile.fpc | 3 ---
 packages/base/pasjpeg/jccoefct.pas | 3 ++-
 packages/base/pasjpeg/jcmaster.pas | 3 ++-
 packages/base/pasjpeg/jconfig.inc  | 5 +++++
 packages/base/pasjpeg/jcphuff.pas  | 2 +-
 packages/base/pasjpeg/jdcoefct.pas | 2 +-
 packages/base/pasjpeg/jdpostct.pas | 3 ++-
 packages/base/pasjpeg/jerror.pas   | 1 +
 packages/base/pasjpeg/jquant1.pas  | 3 ++-
 10 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/base/pasjpeg/Makefile b/packages/base/pasjpeg/Makefile
index 9de851bdae..02fc2ee1ea 100644
--- a/packages/base/pasjpeg/Makefile
+++ b/packages/base/pasjpeg/Makefile
@@ -208,7 +208,6 @@ override PACKAGE_VERSION=1.9.2
 override TARGET_UNITS+=jmorecfg jpeglib jdeferr jerror jcomapi jinclude rdcolmap cdjpeg jdapimin jmemmgr jutils jmemnobs jdmarker jdinput jdapistd jdmaster jdcolor jdsample jdpostct jddctmgr jdct jidctfst jidctint jidctflt jidctred jdphuff jdhuff jdcoefct jdmainct jquant2 jquant1 jdmerge jdatasrc wrbmp wrppm wrtarga
 override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
 override INSTALL_FPCPACKAGE=y
-override COMPILER_OPTIONS+=-Sdg
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
diff --git a/packages/base/pasjpeg/Makefile.fpc b/packages/base/pasjpeg/Makefile.fpc
index 867c7cd1aa..613c939c75 100644
--- a/packages/base/pasjpeg/Makefile.fpc
+++ b/packages/base/pasjpeg/Makefile.fpc
@@ -6,9 +6,6 @@
 name=pasjpeg
 version=1.9.2
 
-[compiler]
-options=-Sdg
-
 [target]
 units=jmorecfg jpeglib jdeferr jerror jcomapi jinclude rdcolmap cdjpeg \
       jdapimin jmemmgr jutils jmemnobs jdmarker jdinput jdapistd jdmaster \
diff --git a/packages/base/pasjpeg/jccoefct.pas b/packages/base/pasjpeg/jccoefct.pas
index 0678418ace..72ea444df4 100644
--- a/packages/base/pasjpeg/jccoefct.pas
+++ b/packages/base/pasjpeg/jccoefct.pas
@@ -8,6 +8,8 @@ Unit JcCoefCt;
 
 interface
 
+{$I jconfig.inc}
+
 uses
   jmorecfg,
   jinclude,
@@ -16,7 +18,6 @@ uses
   jutils,
   jpeglib;
 
-{$I jconfig.inc}
 
 { We use a full-image coefficient buffer when doing Huffman optimization,
   and also for writing multiple-scan JPEG files.  In all cases, the DCT
diff --git a/packages/base/pasjpeg/jcmaster.pas b/packages/base/pasjpeg/jcmaster.pas
index 10c1caa9a2..32c249cfe5 100644
--- a/packages/base/pasjpeg/jcmaster.pas
+++ b/packages/base/pasjpeg/jcmaster.pas
@@ -9,6 +9,8 @@ Unit JcMaster;
 
 interface
 
+{$I jconfig.inc}
+
 uses
   jmorecfg,
   jinclude,
@@ -17,7 +19,6 @@ uses
   jutils,
   jpeglib;
 
-{$I jconfig.inc}
 
 { Initialize master compression control. }
 
diff --git a/packages/base/pasjpeg/jconfig.inc b/packages/base/pasjpeg/jconfig.inc
index d8d0594ba2..596e2f29e5 100644
--- a/packages/base/pasjpeg/jconfig.inc
+++ b/packages/base/pasjpeg/jconfig.inc
@@ -108,3 +108,8 @@
     {$undef RGB_RED_IS_0}          { BGR byte order in JQUANT2 }
   {$endif}
 {$endif}
+
+{$IFDEF FPC}
+{$MODE DELPHI}
+{$GOTO ON}
+{$ENDIF}
\ No newline at end of file
diff --git a/packages/base/pasjpeg/jcphuff.pas b/packages/base/pasjpeg/jcphuff.pas
index 49f4587f93..cb28820b7c 100644
--- a/packages/base/pasjpeg/jcphuff.pas
+++ b/packages/base/pasjpeg/jcphuff.pas
@@ -10,6 +10,7 @@ Unit JcpHuff;
 
 interface
 
+{$I jconfig.inc}
 uses
   jmorecfg,
   jinclude,
@@ -20,7 +21,6 @@ uses
   jcomapi,
   jchuff;       	{ Declarations shared with jchuff.c }
 
-{$I jconfig.inc}
 
 { Module initialization routine for progressive Huffman entropy encoding. }
 
diff --git a/packages/base/pasjpeg/jdcoefct.pas b/packages/base/pasjpeg/jdcoefct.pas
index fb3faf89f2..6438a54b4a 100644
--- a/packages/base/pasjpeg/jdcoefct.pas
+++ b/packages/base/pasjpeg/jdcoefct.pas
@@ -9,6 +9,7 @@ Unit JDCoefCt;
   Also, the input side (only) is used when reading a file for transcoding. }
 
 { Original: jdcoefct.c ; Copyright (C) 1994-1997, Thomas G. Lane. }
+{$I jconfig.inc}
 
 interface
 
@@ -20,7 +21,6 @@ uses
   jutils,
   jpeglib;
 
-{$I jconfig.inc}
 
 {GLOBAL}
 procedure jinit_d_coef_controller (cinfo : j_decompress_ptr;
diff --git a/packages/base/pasjpeg/jdpostct.pas b/packages/base/pasjpeg/jdpostct.pas
index de3d212c96..818392e22b 100644
--- a/packages/base/pasjpeg/jdpostct.pas
+++ b/packages/base/pasjpeg/jdpostct.pas
@@ -12,6 +12,8 @@ Unit JdPostCt;
   An integrated upsample/convert/quantize process would replace this module
   entirely. }
 
+{$I jconfig.inc}
+
 interface
 
 uses
@@ -22,7 +24,6 @@ uses
   jutils,
   jpeglib;
 
-{$I jconfig.inc}
 
 { Initialize postprocessing controller. }
 
diff --git a/packages/base/pasjpeg/jerror.pas b/packages/base/pasjpeg/jerror.pas
index 0bbf208bec..0f6165a99d 100644
--- a/packages/base/pasjpeg/jerror.pas
+++ b/packages/base/pasjpeg/jerror.pas
@@ -9,6 +9,7 @@ Unit Jerror;
 
 { Source: jerror.c;  Copyright (C) 1991-1996, Thomas G. Lane. }
 { note: format_message still contains a hack }
+{$i jconfig.inc}
 interface
 
 uses
diff --git a/packages/base/pasjpeg/jquant1.pas b/packages/base/pasjpeg/jquant1.pas
index a05dcb7468..255f56880b 100644
--- a/packages/base/pasjpeg/jquant1.pas
+++ b/packages/base/pasjpeg/jquant1.pas
@@ -8,10 +8,11 @@ Unit JQuant1;
 
 interface
 
+{$I jconfig.inc}
+
 uses
   jpeglib;
 
-{$I jconfig.inc}
 
 {GLOBAL}
 procedure jinit_1pass_quantizer (cinfo : j_decompress_ptr);