Fixing commit problem

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 3f740e77ac1ec1d5e85f5aabab95a98257f3069c..faa58f106f3654e1c355a434c3f10ae35c45db47 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1

-WX_RELEASE_NUMBER=13
+WX_RELEASE_NUMBER=14

 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0


@@ -475,6 +475,8 @@ DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_WINE=0
 DEFAULT_DEFAULT_wxUSE_PM=0
 
 DEFAULT_DEFAULT_wxUSE_WINE=0
 DEFAULT_DEFAULT_wxUSE_PM=0
 

+PROGRAM_EXT=
+

 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
 dnl and also define the shared library flags below - search for
 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
 dnl and also define the shared library flags below - search for


@@ -626,6 +628,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes

+  DEFAULT_wxUSE_BURNT_NAME=no

   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no


@@ -694,6 +697,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no

+  DEFAULT_wxUSE_FILESYSTEM=no

   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no


@@ -714,6 +718,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no

+  DEFAULT_wxUSE_PLOT=no

   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no


@@ -742,6 +747,7 @@ else
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes

+  DEFAULT_wxUSE_BURNT_NAME=no

   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no


@@ -810,6 +816,7 @@ else
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes

+  DEFAULT_wxUSE_FILESYSTEM=yes

   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes


@@ -825,11 +832,12 @@ else
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes

-  DEFAULT_wxUSE_NEW_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=yes

   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes

+  DEFAULT_wxUSE_PLOT=yes

   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes


@@ -920,6 +928,7 @@ dnl compile options
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)

+WX_ARG_ENABLE(burnt_name,  [  --enable-burnt_name     create set name in shared library ], wxUSE_BURNT_NAME)

 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
 
 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
 


@@ -973,6 +982,7 @@ WX_ARG_ENABLE(wcsrtombs,     [  --enable-wcsrtombs      use wcsrtombs instead of
 WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
 WX_ARG_ENABLE(joystick,      [  --enable-joystick       compile in joystick support (Linux only)], wxUSE_JOYSTICK)
 WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
 WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
 WX_ARG_ENABLE(joystick,      [  --enable-joystick       compile in joystick support (Linux only)], wxUSE_JOYSTICK)
 WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)

+WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)

 WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
 WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
 WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
 WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
 WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
 WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)


@@ -1042,7 +1052,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes

-  DEFAULT_wxUSE_NEW_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=yes

   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes


@@ -1147,6 +1157,7 @@ WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUS
 WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
 WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
 WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
 WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)

+WX_ARG_ENABLE(plot,        [  --enable-plot           use wxPlot], wxUSE_PLOT)

 
 dnl ---------------------------------------------------------------------------
 dnl support for image formats that do not rely on external library
 
 dnl ---------------------------------------------------------------------------
 dnl support for image formats that do not rely on external library


@@ -1208,7 +1219,6 @@ case "${host}" in
   *)
     PATH_IFS=':'
     LEX_STEM="lex.yy"
   *)
     PATH_IFS=':'
     LEX_STEM="lex.yy"

-    PROGRAM_EXT=

   ;;
 esac
 
   ;;
 esac
 


@@ -1834,7 +1844,9 @@ fi
 
     dnl ODBC objects are Unix only
     if test "$TOOLKIT" != "MSW"; then
 
     dnl ODBC objects are Unix only
     if test "$TOOLKIT" != "MSW"; then

-        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        if test "$wxUSE_ODBC" = "yes" ; then
+            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        fi

     fi
 
     if test "$wxUSE_LIBJPEG" = "yes" ; then
     fi
 
     if test "$wxUSE_LIBJPEG" = "yes" ; then


@@ -1859,10 +1871,11 @@ fi
     GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
     DISTDIR="wx\$(TOOLKIT)"
 else
     GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
     DISTDIR="wx\$(TOOLKIT)"
 else

-    dnl leave all TOOLKIT_XXX vars empty
-

     USE_GUI=0
 
     USE_GUI=0
 

+    TOOLKIT_DIR="base"
+    TOOLKIT_DEF="-D__WXBASE__"
+

     dnl the sources, their dependenices and the headers
     ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
     ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"
     dnl the sources, their dependenices and the headers
     ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
     ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"


@@ -1922,7 +1935,9 @@ if test "$wxUSE_SHARED" = "yes"; then
         PIC_FLAG="-fPIC"
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         PIC_FLAG="-fPIC"
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"

-        dnl BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"
+        if test "$wxUSE_BURNT_NAME" = "yes" ; then
+            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
+        fi

       ;;
       *-*-irix5* | *-*-irix6* )
         if test "$GCC" = yes ; then
       ;;
       *-*-irix5* | *-*-irix6* )
         if test "$GCC" = yes ; then


@@ -2574,6 +2589,10 @@ if test "$wxUSE_FILE" = "yes"; then
   AC_DEFINE(wxUSE_FILE)
 fi
 
   AC_DEFINE(wxUSE_FILE)
 fi
 

+if test "$wxUSE_FILESYSTEM" = "yes"; then
+  AC_DEFINE(wxUSE_FILESYSTEM)
+fi
+

 if test "$wxUSE_FS_INET" = "yes"; then
   AC_DEFINE(wxUSE_FS_INET)
 fi
 if test "$wxUSE_FS_INET" = "yes"; then
   AC_DEFINE(wxUSE_FS_INET)
 fi


@@ -2628,6 +2647,10 @@ if test "$wxUSE_LONGLONG" = "yes"; then
   AC_DEFINE(wxUSE_LONGLONG)
 fi
 
   AC_DEFINE(wxUSE_LONGLONG)
 fi
 

+if test "$wxUSE_PLOT" = "yes"; then
+  AC_DEFINE(wxUSE_PLOT)
+fi
+

 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"


@@ -3118,16 +3141,17 @@ if test "$wxUSE_GAUGE" = "yes"; then
   AC_DEFINE(wxUSE_GAUGE)
 fi
 
   AC_DEFINE(wxUSE_GAUGE)
 fi
 

-if test "$wxUSE_GRID" = "yes"; then
-  AC_DEFINE(wxUSE_GRID)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
-fi
-

 if test "$wxUSE_NEW_GRID" = "yes"; then
 if test "$wxUSE_NEW_GRID" = "yes"; then

+  wxUSE_GRID="yes"

   AC_DEFINE(wxUSE_NEW_GRID)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
   AC_DEFINE(wxUSE_NEW_GRID)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 

+if test "$wxUSE_GRID" = "yes"; then
+  AC_DEFINE(wxUSE_GRID)
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
+fi
+

 if test "$wxUSE_IMAGLIST" = "yes"; then
     AC_DEFINE(wxUSE_IMAGLIST)
 fi
 if test "$wxUSE_IMAGLIST" = "yes"; then
     AC_DEFINE(wxUSE_IMAGLIST)
 fi


@@ -3357,8 +3381,7 @@ dnl C/C++ compiler options used to compile wxWindows
 if test "$GXX" = yes ; then
     dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
     CXXWARNINGS="-Wall"
 if test "$GXX" = yes ; then
     dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
     CXXWARNINGS="-Wall"

-    dnl FIXME: there is one weird warning in docview.h:71 which prevents me from
-    dnl        doing this... (VZ)
+    dnl should enable this one day...

     dnl CXXWARNINGS="-Wall -Werror"
 fi
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
     dnl CXXWARNINGS="-Wall -Werror"
 fi
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"


@@ -3374,11 +3397,11 @@ if test "$wxUSE_GUI" = "yes"; then
 
     dnl TODO some samples are never built so far:
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
 
     dnl TODO some samples are never built so far:
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag drawing dynamic \

                      font fractal image minimal richedit"
 
     dnl this is needed to be able to find AFM files
                      font fractal image minimal richedit"
 
     dnl this is needed to be able to find AFM files

-    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
+    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"

 else
     SAMPLES_SUBDIRS=""
 fi
 else
     SAMPLES_SUBDIRS=""
 fi


@@ -3387,7 +3410,8 @@ dnl for convenience, sort the samples in alphabetical order
 dnl
 dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
 dnl       in this list - hence uniq. But normally, this shouldn't be needed!
 dnl
 dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
 dnl       in this list - hence uniq. But normally, this shouldn't be needed!

-dnl       Unfortunately, there is a bug in OS/2's tr, such that 
+dnl
+dnl       Unfortunately, there is a bug in OS/2's tr, such that

 dnl       tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' '
 dnl       only removes the Unix-like part of the introduced line break.
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 dnl       tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' '
 dnl       only removes the Unix-like part of the introduced line break.
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"


@@ -3472,6 +3496,17 @@ dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
 dnl - and we do use it)
 AC_PROG_MAKE_SET
 
 dnl - and we do use it)
 AC_PROG_MAKE_SET
 

+dnl move setup.h back if available
+if test -d include; then
+    if test -d include/wx; then
+        if test -d include/wx/${TOOLKIT_DIR}; then
+            if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
+                mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h 
+            fi
+        fi
+    fi
+fi
+            

 AC_CONFIG_HEADER(setup.h:setup.h.in)
 
 dnl some more GUI only things
 AC_CONFIG_HEADER(setup.h:setup.h.in)
 
 dnl some more GUI only things


@@ -3510,6 +3545,33 @@ AC_OUTPUT([
           ],
           [
             chmod +x wx-config
           ],
           [
             chmod +x wx-config

+            mv wx-config wx${TOOLKIT_DIR}-config
+            ${LN_S} wx${TOOLKIT_DIR}-config wx-config
+            
+            dnl the debian installer wants setup.h to be in the lib subdir
+            dnl so we *copy* it there
+            
+            if test ! -d lib; then
+              mkdir lib
+            fi
+            if test ! -d lib/wx; then
+              mkdir lib/wx
+            fi
+            if test ! -d lib/wx/include; then
+              mkdir lib/wx/include
+            fi
+            if test ! -d lib/wx/include/wx; then
+              mkdir lib/wx/include/wx
+            fi
+            if test ! -d lib/wx/include/wx/${TOOLKIT_DIR}; then
+              mkdir lib/wx/include/wx/${TOOLKIT_DIR}
+            fi
+            if test -f setup.h; then
+                cp -f setup.h lib/wx/include/wx/${TOOLKIT_DIR}/setup.h
+            fi
+
+            dnl *move* setup.h to its final place
+

             if test ! -d include; then
               mkdir include
             fi
             if test ! -d include; then
               mkdir include
             fi


@@ -3522,9 +3584,11 @@ AC_OUTPUT([
             if test -f setup.h; then
                 mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
             fi
             if test -f setup.h; then
                 mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
             fi

+            

           ],
           [
             TOOLKIT_DIR="${TOOLKIT_DIR}"
           ],
           [
             TOOLKIT_DIR="${TOOLKIT_DIR}"

+            LN_S="${LN_S}"

           ]
          )
 
           ]
          )