--- hugin.orig/configure	2004-07-04 19:49:11.000000000 +0000
+++ hugin2/configure	2004-08-23 16:23:53.441592864 +0000
@@ -15,6 +15,7 @@
                    defaults to unix.
   --gtk=(1|2)      specify which gtk has been used to compile
                    wxwindows, default 1. Only used on unix
+  --unicode=(0|1)  override autodetection of wxwindows unicode usage
   --debug          enables debug output and assertations
 EOF
 }
@@ -28,6 +29,7 @@
                       "platform=s" => \$platform, # string
                       "debug"  => \$debug,  # flag
                       "gtk=s" => \$gtk_vers, #string
+                      "unicode=s"  => \$unicode,  # string
                       "help"  => \$help);  # flag
 
 if (!$result) {
@@ -57,7 +59,7 @@
 $_ = `wx-config --version`;
 
 chomp;
-$wxversion=$_;
+#$wxversion=$_;
 m/^(\d).(\d).(\d)/;
 #$wxmajor=$1;
 #$wxminor=$2;
@@ -78,6 +80,22 @@
 chomp($WXWIN_CFLAGS);
 chomp($WXWIN_LFLAGS);
 
+if (!defined($unicode)) {
+    if ($WXWIN_LFLAGS =~ /gtk2u/) {
+        $unicode = 1;
+    } else {
+        $unicode = 0;
+    }
+}
+
+if ($unicode) {
+    $WXWIN_CFLAGS =~ s/gtk2-/gtk2u-/g;
+    $WXWIN_LFLAGS =~ s/gtk2-/gtk2u-/g;
+} else {
+    $WXWIN_CFLAGS =~ s/gtk2u-/gtk2-/g;
+    $WXWIN_LFLAGS =~ s/gtk2u-/gtk2-/g;
+}
+
 my $EXTRA_CFLAGS;
 if ($debug) {
 #    $WXWIN_CFLAGS="$WXWIN_CFLAGS -D__WXDEBUG__";
@@ -96,9 +114,10 @@
         $XRC_LFLAGS="-lwx_gtk_xrc-$wxrelease";
         $WXWIN_CFLAGS = $WXWIN_CFLAGS . " " . `gtk-config --cflags`;
     } else {
-        $XRC_LFLAGS="-lwx_gtk2_xrc-$wxrelease";
+        $XRC_LFLAGS="-lwx_gtk2" . ($unicode ? "u" : "") ."_xrc-$wxrelease";
         $WXWIN_CFLAGS = $WXWIN_CFLAGS . " " . `pkg-config --cflags-only-I gtk+-2.0`;
     }
+    chomp($WXWIN_CFLAGS);
 }
 
 # check for external vigra
@@ -120,6 +139,8 @@
 
 print "\nConfiguration summary for hugin:\n";
 print "  platform: $platform\n";
+print "  gtk version: $gtk_vers\n";
+print "  using unicode library versions: " . ($unicode ? "yes" : "no") . "\n";
 print "  prefix: $prefix\n";
 if ($debug) {
     print "  debug: enabled\n";
@@ -165,6 +186,8 @@
 
 while (<CONF_T>) {
     s/__PREFIX__/$prefix/g;
+    s/__WXWIN_CFLAGS__/$WXWIN_CFLAGS/g;
+    s/__WXWIN_LFLAGS__/$WXWIN_LFLAGS/g;
     print CONF;
 }
 close (CONF_T);
--- hugin.orig/src/PanoImage/makefile.unx.tmpl	2003-08-04 18:06:47.000000000 +0000
+++ hugin2/src/PanoImage/makefile.unx.tmpl	2004-08-23 16:14:37.612091792 +0000
@@ -27,14 +27,14 @@
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) $(CC_ARGS) -c `wx-config --cflags` -o $@ $<
+	$(CC) $(CC_ARGS) -c __WXWIN_CFLAGS__ -o $@ $<
 
 all:    $(PROGRAM)
 
 apps:	$(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CC) -o $(PROGRAM) $(OBJECTS) __WXWIN_LFLAGS__
 
 clean:
 	rm -f *.o $(PROGRAM)