X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00cf1208927c373bfd326f4dc1083e1ab84a1dd5..9dff41820aec1547886cde342ce8f7834ebbcd0b:/configure.in

diff --git a/configure.in b/configure.in
index 5ec8bc0eca..92f49340d5 100644
--- a/configure.in
+++ b/configure.in
@@ -475,6 +475,8 @@ DEFAULT_DEFAULT_wxUSE_MSW=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
@@ -1214,7 +1216,6 @@ case "${host}" in
   *)
     PATH_IFS=':'
     LEX_STEM="lex.yy"
-    PROGRAM_EXT=
   ;;
 esac
 
@@ -1867,10 +1868,11 @@ fi
     GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
     DISTDIR="wx\$(TOOLKIT)"
 else
-    dnl leave all TOOLKIT_XXX vars empty
-
     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}"
@@ -1931,7 +1933,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         if test "$wxUSE_BURNT_NAME" = "yes" ; then
-            BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"
+            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
         fi
       ;;
       *-*-irix5* | *-*-irix6* )
@@ -3132,16 +3134,17 @@ if test "$wxUSE_GAUGE" = "yes"; then
   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
+  wxUSE_GRID="yes"
   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
@@ -3371,8 +3374,7 @@ dnl C/C++ compiler options used to compile wxWindows
 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"
@@ -3401,7 +3403,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       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'`"
@@ -3535,6 +3538,8 @@ AC_OUTPUT([
           ],
           [
             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
@@ -3557,9 +3562,9 @@ AC_OUTPUT([
             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
@@ -3576,6 +3581,7 @@ AC_OUTPUT([
           ],
           [
             TOOLKIT_DIR="${TOOLKIT_DIR}"
+            LN_S="${LN_S}"
           ]
          )