Add --with-archflags option to configure script, and use it in the right

places.

Update changes file.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5216 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

6 files changed, 61 insertions, 52 deletions

diff --git a/CHANGES b/CHANGES
index cc2828deb..eb4653a78 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,15 @@
 CHANGES IN FLTK 1.1.8
 
+	- Added --with-archflags configure option to allow
+	  passing of specific architecture-selection options to
+	  the compiler and linker.
 	- Fixed WIN32 window stacking bug (STR #1296)
-	- Fixed wrong code generated by Fluid
-	  for Scrollbars (STR #1287)
-	- Loading a file would not update the Widget
-	  Propertis dialog in FLUID (STR #1326)
-	- Fixed key compose sequences for
-	  shifted keys (STR #1194)
+	- Fixed wrong code generated by FLUID for Scrollbars (STR
+	  #1287)
+	- Loading a file would not update the Widget Properties
+	  dialog in FLUID (STR #1326)
+	- Fixed key compose sequences for shifted keys (STR
+	  #1194)
 	- Added text selection and copy to Fl_Help_View.
 	- Fixed position of popup menu titles (STR #1322)
 	- Showing any window will disable the current tooltip
@@ -14,14 +17,14 @@ CHANGES IN FLTK 1.1.8
 	- Updated documentation to reflect limitation of 
 	  Fl::delete_widget() (STR #1306)
 	- Fixed line wrapping in Fl_Text_Display (STR #1227)
-	- New function Fl::event_original_key() returns key 
-	  code before NumLock handling.
+	- New function Fl::event_original_key() returns key  code
+	  before NumLock handling.
 	- Many OS X Quartz fixes (STR #1310, etc.)
-	- Fixed shortcut and default focus for message
-	  dialogs (STR #1298)
+	- Fixed shortcut and default focus for message dialogs
+	  (STR #1298)
 	- Fixed focus issues (STR #1286, STR #1289, STR #1296)
 	- Fixed window resizing in OS X (STR #1297)
-	- In Fluid, declarations starting with the keyword
+	- In FLUID, declarations starting with the keyword
 	  'typedef', 'class', or 'struct' are now treated
 	  correctly if inside a class (STR #1283)
 	- Tabs now show the correct tooltip (STR #1282)
@@ -34,9 +37,9 @@ CHANGES IN FLTK 1.1.8
 	- Fixed maximizing in OS X (STR #1221)
 	- Fixed 'make distclean' to remove binaries inside
 	  MacOS app packages (STR #1169)
-	- Fluid Code Viewer is now truly a viewer, not a text
+	- FLUID Code Viewer is now truly a viewer, not a text
 	  editor because edited text can not be saved.
-	- Fl_Spinner is now fully supported by Fluid (STR #1158)
+	- Fl_Spinner is now fully supported by FLUID (STR #1158)
 	- Fixed usage of deleted object after menu pulldown
 	  (STR #1162)
 	- Calling fl_font(0, 0) under Xft would access a NULL
@@ -283,8 +286,8 @@ CHANGES IN FLTK 1.1.7
 	- Fixed symbol demo label bug (STR #777)
 	- Fixed position of menu titles (STR #795)
 	- Added missing Fl_Window::copy_label() method.
-	- Fixed wrong tooltip in fluid (STR #784)
-	- Added zlib path to fluid (STR #783)
+	- Fixed wrong tooltip in FLUID (STR #784)
+	- Added zlib path to FLUID (STR #783)
 	- Menus and other pop-up windows now obey screen
 	  boundaries on multi-screen displays (STR #781)
 	- Fl_Chart would draw outside its bounding box (STR #780)
@@ -842,7 +845,7 @@ CHANGES IN FLTK 1.1.4rc2
 	  (STR #115)
 	- The 'Enter' key event on OS X would not set
 	  Fl::e_text.
-	- Changed behaviour of fluid to always paste into
+	- Changed behaviour of FLUID to always paste into
 	  a selected group (STR #88)
 	- Menuitem now changes font, even if fontsize
 	  is not set (STR #110)
@@ -971,7 +974,7 @@ CHANGES IN FLTK 1.1.4rc1
 	  copying using the wrong string size (STR #14)
 	- fl_font() and fl_size() were not implemented on MacOS
 	  X.
-	- Sorted the icon menu bar in fluid.
+	- Sorted the icon menu bar in FLUID.
 	- Fixed minor memory access complaints from Valgrind
 	- Compiling src/flstring.h on OS X with BSD header would
 	  fail.
@@ -1954,7 +1957,7 @@ CHANGES IN FLTK 1.1.0b7
 	  nicer.
 	- Fixed the drawing of large areas with the new
 	  plastic boxtypes.
-	- Updated the Visual C++ demo projects to use fluid
+	- Updated the Visual C++ demo projects to use FLUID
 	  to generate the GUI files as needed.
 	- The demo program didn't load the right menu file
 	  when compiled for debugging under WIN32.
@@ -2595,7 +2598,7 @@ CHANGES SINCE FLTK 1.0.9
 	  needed (still converts indexed images to full RGB and
 	  dithers, tho...)
 
-	- Fixed .gif files in fluid, they were broken by the fix
+	- Fixed .gif files in FLUID, they were broken by the fix
 	  for large .xpm files in version 1.0.9.
 
 	- Fix for OpenGL hardware overlays with the transparent
@@ -3104,7 +3107,7 @@ CHANGES SINCE FLTK 1.0
     - Documentation fixes.
     - Fl::check() didn't return the correct value, breaking a number
       of applications.
-    - Fixed fluid bug that caused styles patch to crash when you delete
+    - Fixed FLUID bug that caused styles patch to crash when you delete
       a menu item.
     - Updated valuators demo to put the values in the gui box.
     - Fl_Browser_::item_height() didn't always compute the correct
diff --git a/configure.in b/configure.in
index 54960b0bc..8ec6f04ed 100644
--- a/configure.in
+++ b/configure.in
@@ -56,11 +56,13 @@ if test "x$uname" = x; then
 fi
 
 dnl Don't automatically add "-g" to compiler options...
+ARCHFLAGS="${ARCHFLAGS:=}"
 CFLAGS="${CFLAGS:=}"
 CPPFLAGS="${CPPFLAGS:=}"
 CXXFLAGS="${CXXFLAGS:=}"
 OPTIM="${OPTIM:=}"
 
+AC_SUBST(ARCHFLAGS)
 AC_SUBST(OPTIM)
 
 dnl OS-specific pre-tests...
@@ -69,10 +71,7 @@ case $uname in
         # Handle Cygwin option *first*, before all other tests.
 	AC_ARG_ENABLE(cygwin, [  --enable-cygwin         use the CygWin libraries [default=no]])
 	if test x$enable_cygwin != xyes; then
-	    CFLAGS="$CFLAGS -mno-cygwin"
-	    CPPFLAGS="$CPPFLAGS -mno-cygwin"
-	    CXXFLAGS="$CXXFLAGS -mno-cygwin"
-	    LDFLAGS="$LDFLAGS -mno-cygwin"
+	    ARCHFLAGS="$ARCHFLAGS -mno-cygwin"
 	fi
 	;;
 esac
@@ -237,6 +236,10 @@ AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support
 
 AC_ARG_WITH(optim, [  --with-optim="flags"    use custom optimization flags])
 
+AC_ARG_WITH(archflags, [  --with-archflags="flags"
+                          use custom architecture flags],
+    ARCHFLAGS="$withval")
+
 case $uname in
     Darwin*)
         AC_ARG_ENABLE(quartz, [  --enable-quartz         use Quartz instead of Quickdraw (default=no)])
diff --git a/fltk-config.in b/fltk-config.in
index 5e5a3b6ee..2d00f2a94 100755
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -53,6 +53,7 @@ CXX="@CXX@"
 POSTBUILD="@POSTBUILD@"
 
 # flags for C++ compiler:
+ARCHFLAGS="@ARCHFLAGS@"
 CFLAGS="@CFLAGS@ @LARGEFILE@"
 CXXFLAGS="@CXXFLAGS@ @LARGEFILE@"
 LDFLAGS="@LDFLAGS@"
@@ -262,8 +263,8 @@ if test -n "$compile"; then
 	    
     post=$prog
 
-    echo $CXX $includes $CXXFLAGS $debug -o $prog $compile $LDSTATIC
-    $CXX $includes $CXXFLAGS $debug -o $prog $compile $LDSTATIC
+    echo $CXX $ARCHFLAGS $includes $CXXFLAGS $debug -o $prog $compile $LDSTATIC
+    $CXX $ARCHFLAGS $includes $CXXFLAGS $debug -o $prog $compile $LDSTATIC
 fi
 
 if test -n "$post" -a "$POSTBUILD" != ":"; then
diff --git a/fluid/Makefile b/fluid/Makefile
index a85634711..13cb2bb78 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -57,14 +57,14 @@ all:	$(FLUID) fluid$(EXEEXT)
 fluid$(EXEEXT):		$(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
 			../lib/$(IMGLIBNAME)
 	echo Linking $@...
-	$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 	$(CP) $@ fluid.app/Contents/MacOS
 
 fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
 			../src/$(IMGDSONAME)
 	echo Linking $@...
-	$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 clean:
diff --git a/makeinclude.in b/makeinclude.in
index 8c89813a2..9fc19587f 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -54,6 +54,7 @@ CC		= @CC@
 MAKEDEPEND	= @MAKEDEPEND@
 
 # flags for C++ compiler:
+ARCHFLAGS	= @ARCHFLAGS@
 OPTIM		= @OPTIM@
 CFLAGS		= $(OPTIM) @LARGEFILE@ @CPPFLAGS@ @CFLAGS@
 CXXFLAGS	= $(OPTIM) @LARGEFILE@ @CPPFLAGS@ @CXXFLAGS@
@@ -118,16 +119,16 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
 
 .o$(EXEEXT):
 	echo Linking $@...
-	$(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
 	$(POSTBUILD) $@ ../FL/mac.r
 
 .c.o:
 	echo Compiling $<...
-	$(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
+	$(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
 
 .cxx.o:
 	echo Compiling $<...
-	$(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
+	$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
 
 .man.0 .man.1 .man.3:
 	echo Formatting $<...
diff --git a/test/Makefile b/test/Makefile
index 12d23d6b2..10da50ae2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -258,7 +258,7 @@ buttons$(EXEEXT): buttons.o
 
 checkers$(EXEEXT): checkers.o
 	echo Linking $@...
-	$(CXX) $(CXXFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
 	$(CP) checkers$(EXEEXT) checkers.app/Contents/MacOS
 	$(POSTBUILD) $@ ../FL/mac.r
 
@@ -266,7 +266,7 @@ clock$(EXEEXT): clock.o
 
 colbrowser$(EXEEXT): colbrowser.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 color_chooser$(EXEEXT): color_chooser.o
@@ -277,14 +277,14 @@ curve$(EXEEXT): curve.o
 
 demo$(EXEEXT): demo.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 doublebuffer$(EXEEXT): doublebuffer.o
 
 editor$(EXEEXT): editor.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 fast_slow$(EXEEXT): fast_slow.o
@@ -292,21 +292,21 @@ fast_slow.cxx:	fast_slow.fl
 
 file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME)
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 fonts$(EXEEXT): fonts.o
 
 forms$(EXEEXT): forms.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 hello$(EXEEXT): hello.o
 
 help$(EXEEXT): help.o ../lib/$(IMGLIBNAME)
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 iconize$(EXEEXT): iconize.o
@@ -322,14 +322,14 @@ input_choice$(EXEEXT): input_choice.o
 
 keyboard$(EXEEXT): keyboard_ui.o keyboard.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 keyboard_ui.o:	keyboard_ui.h
 keyboard_ui.cxx:	keyboard_ui.fl
 
 label$(EXEEXT): label.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 line_style$(EXEEXT): line_style.o
@@ -338,7 +338,7 @@ list_visuals$(EXEEXT): list_visuals.o
 
 mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 mandelbrot_ui.o:	mandelbrot_ui.h
 mandelbrot_ui.cxx:	mandelbrot_ui.fl
@@ -353,7 +353,7 @@ navigation$(EXEEXT): navigation.o
 
 output$(EXEEXT): output.o ../lib/$(FLLIBNAME)
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 overlay$(EXEEXT): overlay.o
@@ -364,7 +364,7 @@ pixmap$(EXEEXT): pixmap.o
 
 pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME)
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 preferences$(EXEEXT):	preferences.o
@@ -384,14 +384,14 @@ subwindow$(EXEEXT): subwindow.o
 
 sudoku: sudoku.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
 	$(CP) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
 	$(POSTBUILD) $@ ../FL/mac.r
 
 sudoku.exe: sudoku.o sudoku.rc
 	echo Linking $@...
 	windres sudoku.rc sudokures.o
-	$(CXX) -I.. $(CXXFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
 
 symbols$(EXEEXT): symbols.o
 
@@ -416,7 +416,8 @@ $(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME)
 # OpenGL demos...
 CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
 	echo Linking $@...
-	$(CXX) $(CXXFLAGS) -o $@ CubeMain.o CubeView.o CubeViewUI.o \
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ \
+		CubeMain.o CubeView.o CubeViewUI.o \
 		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 CubeMain.o: CubeViewUI.h CubeView.h
@@ -426,27 +427,27 @@ CubeViewUI.cxx:	CubeViewUI.fl
 
 cube$(EXEEXT): cube.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 fractals$(EXEEXT): fractals.o fracviewer.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 fullscreen$(EXEEXT): fullscreen.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 glpuzzle$(EXEEXT): glpuzzle.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 gl_overlay$(EXEEXT): gl_overlay.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
 shape$(EXEEXT): shape.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r