--- unixodbc-gui-qt-2.3.0.orig/configure +++ unixodbc-gui-qt-2.3.0/configure @@ -622,11 +622,6 @@ QT_CXXFLAGS UIC MOC -X_EXTRA_LIBS -X_LIBS -X_PRE_LIBS -X_CFLAGS -XMKMF LIBNSL LIBSOCKET PTH_LIBS @@ -645,7 +640,6 @@ LIBICONV SHLIBEXT subdirs -CXXCPP OTOOL64 OTOOL LIPO @@ -792,7 +786,6 @@ with_iconv_ucode_enc with_pth with_pth_test -with_x with_qt_dir_include with_qt_dir_lib with_qt_dir_bin @@ -810,9 +803,7 @@ CPP CXX CXXFLAGS -CCC -CXXCPP -XMKMF' +CCC' ac_subdirs_all='libltdl' # Initialize some variables set by options. @@ -1417,10 +1408,6 @@ --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM run sed PROGRAM on installed program names -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR - System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] @@ -1465,8 +1452,8 @@ --with-iconv-ucode-enc=enc Encoding to use as UNICODE default=auto-search --with-pth=ARG Build with GNU Pth Library (default=yes) --with-pth-test Perform GNU Pth Sanity Test (default=yes) - --with-x use the X Window System - --with-qt-include=DIR location of Qt include files + --with-qt_dir_include=DIR + location of Qt include files --with-qt-lib=DIR location of Qt lib files --with-qt-bin=DIR location of Qt bin files @@ -1487,8 +1474,6 @@ CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1956,43 +1941,6 @@ } # ac_fn_c_check_func -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - # ac_fn_cxx_try_link LINENO # ------------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -6824,7 +6772,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8774,6 +8722,7 @@ + func_stripname_cnf () { case ${2} in @@ -9898,6 +9847,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -10120,7 +10072,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10297,6 +10249,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10753,7 +10706,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11606,6 +11559,7 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -11789,6 +11743,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12737,145 +12703,6 @@ CC="$lt_save_CC" - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12902,8 +12729,6 @@ module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds -reload_flag_CXX=$reload_flag -reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -12959,7 +12784,6 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -12977,7 +12801,6 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do @@ -13117,9 +12940,14 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13150,7 +12978,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else GXX=no @@ -13263,7 +13091,7 @@ if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : + if ${lt_cv_aix_libpath_+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13286,26 +13114,26 @@ p } }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" fi fi - aix_libpath=$lt_cv_aix_libpath__CXX + aix_libpath=$lt_cv_aix_libpath_ fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -13317,7 +13145,7 @@ if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : + if ${lt_cv_aix_libpath_+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13340,21 +13168,21 @@ p } }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" fi fi - aix_libpath=$lt_cv_aix_libpath__CXX + aix_libpath=$lt_cv_aix_libpath_ fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -13362,13 +13190,8 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -13398,75 +13221,28 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_CXX=' ' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=yes - file_list_spec_CXX='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' - enable_shared_with_static_runtimes_CXX=yes - # Don't use ranlib - old_postinstall_cmds_CXX='chmod 644 $oldlib' - postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - esac - ;; + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; darwin* | rhapsody*) @@ -13539,11 +13315,6 @@ gnu*) ;; - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs_CXX=yes - ;; - hpux9*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13568,11 +13339,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13633,7 +13404,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then @@ -13643,10 +13414,10 @@ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13676,7 +13447,7 @@ case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13687,9 +13458,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13700,7 +13471,7 @@ inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13718,7 +13489,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13755,26 +13526,26 @@ pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5].* | *pgcpp\ [1-5].*) + *pgCC\ [1-5]* | *pgcpp\ [1-5]*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 and above use weak symbols + *) # Version 6 will use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -13782,7 +13553,7 @@ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -13801,9 +13572,9 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; - xl* | mpixl* | bgxl*) + xl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13823,13 +13594,13 @@ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13898,7 +13669,7 @@ export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo else ld_shlibs_CXX=no fi @@ -13933,15 +13704,15 @@ case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -13957,17 +13728,17 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -13977,7 +13748,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -14013,7 +13784,7 @@ solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -14034,7 +13805,7 @@ esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -14054,14 +13825,14 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -14072,7 +13843,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -14126,10 +13897,6 @@ CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" - reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -14623,7 +14390,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -14992,6 +14759,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -15439,6 +15209,7 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -15622,6 +15393,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15910,7 +15693,6 @@ fi # test -n "$compiler" CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -16032,6 +15814,11 @@ $as_echo "$shrext_cmds" >&6; } +cat >>confdefs.h <<_ACEOF +#define MODULEDIR "`eval echo $libdir/odbc`" +_ACEOF + + if test "x$iconv" = "xtrue"; then @@ -17792,707 +17579,22 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } -# Check whether --with-x was given. -if test "${with_x+set}" = set; then : - withval=$with_x; -fi -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : - $as_echo_n "(cached) " >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /usr/lib64 | /lib | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R7/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R7 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R7/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R7 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # We can compile using X headers with no special include directory. -ac_x_includes= -else - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.i conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac -fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" -else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -$as_echo "neither works" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XOpenDisplay (); -int -main () -{ -return XOpenDisplay (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dnet_dnet_ntoa=yes -else - ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes; then : - -fi - - if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_nsl_gethostbyname=yes -else - ac_cv_lib_nsl_gethostbyname=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bsd_gethostbyname=yes -else - ac_cv_lib_bsd_gethostbyname=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes; then : - -fi - - if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if ${ac_cv_lib_socket_connect+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -int -main () -{ -return connect (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_connect=yes -else - ac_cv_lib_socket_connect=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes; then : - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes; then : - -fi - - if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if ${ac_cv_lib_posix_remove+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char remove (); -int -main () -{ -return remove (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_posix_remove=yes -else - ac_cv_lib_posix_remove=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes; then : - -fi - - if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if ${ac_cv_lib_ipc_shmat+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shmat (); -int -main () -{ -return shmat (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ipc_shmat=yes -else - ac_cv_lib_ipc_shmat=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char IceConnectionNumber (); -int -main () -{ -return IceConnectionNumber (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ICE_IceConnectionNumber=yes -else - ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - - - - - - cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. + cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. _ACEOF @@ -18624,12 +17726,76 @@ # No lib location given? Lets check a few known places. # if test "x$qt_dir_lib" = x; then - if test -e "/usr/lib64/libQtCore.so"; then - qt_dir_lib="/usr/lib64" - elif test -e "/usr/lib/libQtCore.so"; then - qt_dir_lib="/usr/lib" - fi + qt_dir_lib=default + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + ac_cxxflags_save="$CXXFLAGS" + ac_ldflags_save="$LDFLAGS" + ac_libs_save="$LIBS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS -I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui $X_CFLAGS $all_includes" + if test "x$qt_dir_lib" != xdefault; then + LDFLAGS="$LDFLAGS -L$qt_dir_lib" + fi + LIBS="$LIBS $PTHREAD_LIBS $qt_libs" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include +int +main () +{ +QString s = "hello world"; + QMessageBox::information(0, s, "no he is not"); + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + qt_compile=yes +else + qt_compile=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CXXFLAGS="$ac_cxxflags_save" + LDFLAGS="$ac_ldflags_save" + LIBS="$ac_libs_save" + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + if test "x$qt_compile" = "xyes"; then : + +else + + if test -e "/usr/lib64/libQtCore.so"; then + qt_dir_lib="/usr/lib64" + elif test -e "/usr/lib/libQtCore.so"; then + qt_dir_lib="/usr/lib" + else + qt_dir_lib="" + fi + +fi + fi + CXXFLAGS="$ac_cxxflags_save" + LIBS="$ac_libs_save" # # No bin location given? Lets check a few known places. @@ -18644,8 +17810,8 @@ # Still not found - we fail. # if test "x$qt_dir_include" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (include try specifying with --with-qt-include or try a different value)" >&5 -$as_echo "no (include try specifying with --with-qt-include or try a different value)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (include try specifying with --with-qt_dir_include or try a different value)" >&5 +$as_echo "no (include try specifying with --with-qt_dir_include or try a different value)" >&6; } as_fn_error $? "cannot find Qt!" "$LINENO" 5 fi @@ -18728,15 +17894,6 @@ MOC="$qt_dir_bin"/moc UIC="$qt_dir_bin"/uic - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: qt_dir_lib=$qt_dir_lib" >&5 $as_echo "$as_me: qt_dir_lib=$qt_dir_lib" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: LDFLAGS=$LDFLAGS" >&5 @@ -18747,12 +17904,22 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a simple Qt program compiles" >&5 $as_echo_n "checking whether a simple Qt program compiles... " >&6; } + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ac_cxxflags_save="$CXXFLAGS" ac_ldflags_save="$LDFLAGS" ac_libs_save="$LIBS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS -I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui $X_CFLAGS $all_includes" - LDFLAGS="$LDFLAGS -L$qt_dir_lib $X_LIBS $X_LDFLAGS" - LIBS="$LIBS $PTHREAD_LIBS $qt_libs $X_EXTRA_LIBS -lXext -lX11 $X_PRE_LIBS $EXTRA_XLIBS" + if test "x$qt_dir_lib" != xdefault; then + LDFLAGS="$LDFLAGS -L$qt_dir_lib" + fi + LIBS="$LIBS $PTHREAD_LIBS $qt_libs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18788,21 +17955,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$qt_compile" = "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if test "x$qt_compile" = "xyes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "cannot compile a Qt program!" "$LINENO" 5 - fi + +fi QT_CXXFLAGS="-I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui -I$qt_dir_include/QtAssistant -I$qt_dir_include/QtNetwork" - QT_LDFLAGS="-L$qt_dir_lib" + if test "x$qt_dir_lib" = xdefault; then + QT_LDFLAGS="" + else + QT_LDFLAGS="-L$qt_dir_lib" + fi QT_LIBS="$qt_libs" --- unixodbc-gui-qt-2.3.0.orig/acinclude.m4 +++ unixodbc-gui-qt-2.3.0/acinclude.m4 @@ -637,3 +637,1012 @@ ]) m4_include([qt.m4]) + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[AC_REQUIRE([_LT_PROG_CXX])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test $supports_anon_versioning = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + gnu*) + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 will use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + xl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + --- unixodbc-gui-qt-2.3.0.orig/aclocal.m4 +++ unixodbc-gui-qt-2.3.0/aclocal.m4 @@ -2476,6 +2476,7 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -2640,6 +2641,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3245,7 +3258,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4056,7 +4069,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4514,6 +4527,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4577,6 +4593,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4799,7 +4818,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4976,6 +4995,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5284,7 +5304,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -8330,7 +8350,7 @@ # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) --- unixodbc-gui-qt-2.3.0.orig/configure.in +++ unixodbc-gui-qt-2.3.0/configure.in @@ -135,6 +135,10 @@ AC_MSG_RESULT($shrext_cmds) AC_SUBST(SHLIBEXT) +dnl export the libdir, so we can have a multiarch-friendly search path +dnl for ODBC drivers. +AC_DEFINE_UNQUOTED([MODULEDIR], ["`eval echo $libdir/odbc`"]) + if test "x$iconv" = "xtrue"; then --- unixodbc-gui-qt-2.3.0.orig/qt.m4 +++ unixodbc-gui-qt-2.3.0/qt.m4 @@ -5,8 +5,6 @@ AC_DEFUN([FUN_CHECK_QT], [ AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PATH_X]) - AC_REQUIRE([AC_PATH_XTRA]) AC_CACHE_SAVE @@ -24,7 +22,7 @@ # # Create configure option for include location... # - AC_ARG_WITH([qt_dir_include], AC_HELP_STRING([--with-qt-include=DIR], + AC_ARG_WITH([qt_dir_include], AC_HELP_STRING([--with-qt_dir_include=DIR], [location of Qt include files]), [ qt_dir_include="$withval" ]) @@ -58,12 +56,19 @@ # No lib location given? Lets check a few known places. # if test "x$qt_dir_lib" = x; then - if test -e "/usr/lib64/libQtCore.so"; then - qt_dir_lib="/usr/lib64" - elif test -e "/usr/lib/libQtCore.so"; then - qt_dir_lib="/usr/lib" - fi + qt_dir_lib=default + FUN_QT_COMPILE([], [ + if test -e "/usr/lib64/libQtCore.so"; then + qt_dir_lib="/usr/lib64" + elif test -e "/usr/lib/libQtCore.so"; then + qt_dir_lib="/usr/lib" + else + qt_dir_lib="" + fi + ]) fi + CXXFLAGS="$ac_cxxflags_save" + LIBS="$ac_libs_save" # # No bin location given? Lets check a few known places. @@ -78,7 +83,7 @@ # Still not found - we fail. # if test "x$qt_dir_include" = x; then - AC_MSG_RESULT([no (include try specifying with --with-qt-include or try a different value)]) + AC_MSG_RESULT([no (include try specifying with --with-qt_dir_include or try a different value)]) AC_MSG_ERROR([cannot find Qt!]) fi @@ -112,13 +117,25 @@ MOC="$qt_dir_bin"/moc UIC="$qt_dir_bin"/uic - FUN_QT_COMPILE + AC_MSG_NOTICE([qt_dir_lib=$qt_dir_lib]) + AC_MSG_NOTICE([LDFLAGS=$LDFLAGS]) + AC_MSG_NOTICE([X_LIBS=$X_LIBS]) + + AC_MSG_CHECKING([whether a simple Qt program compiles]) + FUN_QT_COMPILE([AC_MSG_RESULT([yes])], [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot compile a Qt program!]) + ]) AC_SUBST(MOC) AC_SUBST(UIC) QT_CXXFLAGS="-I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui -I$qt_dir_include/QtAssistant -I$qt_dir_include/QtNetwork" AC_SUBST(QT_CXXFLAGS) - QT_LDFLAGS="-L$qt_dir_lib" + if test "x$qt_dir_lib" = xdefault; then + QT_LDFLAGS="" + else + QT_LDFLAGS="-L$qt_dir_lib" + fi AC_SUBST(QT_LDFLAGS) QT_LIBS="$qt_libs" AC_SUBST(QT_LIBS) @@ -136,18 +153,14 @@ AC_LANG_PUSH(C++) - AC_MSG_NOTICE([qt_dir_lib=$qt_dir_lib]) - AC_MSG_NOTICE([LDFLAGS=$LDFLAGS]) - AC_MSG_NOTICE([X_LIBS=$X_LIBS]) - - AC_MSG_CHECKING([whether a simple Qt program compiles]) - ac_cxxflags_save="$CXXFLAGS" ac_ldflags_save="$LDFLAGS" ac_libs_save="$LIBS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS -I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui $X_CFLAGS $all_includes" - LDFLAGS="$LDFLAGS -L$qt_dir_lib $X_LIBS $X_LDFLAGS" - LIBS="$LIBS $PTHREAD_LIBS $qt_libs $X_EXTRA_LIBS -lXext -lX11 $X_PRE_LIBS $EXTRA_XLIBS" + if test "x$qt_dir_lib" != xdefault; then + LDFLAGS="$LDFLAGS -L$qt_dir_lib" + fi + LIBS="$LIBS $PTHREAD_LIBS $qt_libs" AC_TRY_LINK([ #include @@ -163,10 +176,5 @@ AC_LANG_POP(C++) - if test "x$qt_compile" = "xyes" ; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot compile a Qt program!]) - fi + AS_IF([test "x$qt_compile" = "xyes"], [$1], [$2]) ])#FUN_QT_COMPILE --- unixodbc-gui-qt-2.3.0.orig/Makefile.in +++ unixodbc-gui-qt-2.3.0/Makefile.in @@ -196,11 +196,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ --- unixodbc-gui-qt-2.3.0.orig/debian/unixodbc-bin.install +++ unixodbc-gui-qt-2.3.0/debian/unixodbc-bin.install @@ -0,0 +1,2 @@ +usr/bin/ODBCCreateDataSourceQ4 +usr/bin/ODBCManageDataSourcesQ4 --- unixodbc-gui-qt-2.3.0.orig/debian/changelog +++ unixodbc-gui-qt-2.3.0/debian/changelog @@ -0,0 +1,796 @@ +unixodbc-gui-qt (2.3.0-2ubuntu1) precise; urgency=low + + * Fix FTBFS with Qt 4.8. (LP: #935478) + - Call make clean after configure to remove all moc-autogenerated files. + + -- Felix Geyer Sun, 25 Mar 2012 19:44:46 +0200 + +unixodbc-gui-qt (2.3.0-2) unstable; urgency=low + + [ Steve Langasek ] + * Update debian/copyright with current information for the new source. + * Fix Vcs-* fields for new source package name + + [ Colin Watson ] + * Fix build failure with multiarch Qt: test whether the Qt libraries are + on the default linker path, and if so don't bother trying /usr/lib64 and + /usr/lib. Closes: #649166. + + -- Steve Langasek Fri, 18 Nov 2011 14:38:30 -0800 + +unixodbc-gui-qt (2.3.0-1) unstable; urgency=low + + * First upstream release of the split unixODBC GUI Qt package. + * The new version is Qt4-only. Closes: #604387. The tools have been + split and renamed in the process. + * qt.m4: kill the gratuitous checks for X. Qt takes care of its own + graphic dependencies. + * qt.m4: fix broken usage information. + * Use the new --with-qt_dir_include option. + * Pull in ini/ini.h, gtrtstQ4/gtrtstQ4.exp and + ODBCTestQ4/ODBCTestQ4-48.xpm, missing from the upstream tarball. + * ODBCTestQ4/DlgEnvAllocEnv.cpp, ODBCTestQ4/conn.cpp: pass some default + values which for some reason the compiler can't figure out on its own + * Add _LT_LANG_CXX_CONFIG back to acinclude.m4, since libtool upstream + still doesn't handle symbol export lists right for C++. + * Remove a spurious blank line from the .exp files which breaks the + syntax of the resulting version script. + * update debian/libodbcinstq4-1.symbols for new symbol. + * update unixodbc-bin.menu for the new command names. + + -- Steve Langasek Wed, 24 Aug 2011 01:08:53 +0000 + +unixodbc (2.2.14p2-3) unstable; urgency=low + + * Add Vcs-Bzr field. + * Build for multiarch. + * Split unixodbc into a libodbc1 package and a unixodbc package, + the latter now containing just isql and with a versioned dependency on + libodbc1 for compatibility with existing dependencies. This is better + that moving isql into a new 'isql' package and having unixodbc depend + on it because 'unixodbc' is a wrong name for a library package. + * exe/isql.c: patch from upstream to fix isql segfault with the -b option. + Thanks to Tim Gokcen for reporting. Closes: #607895. + * Call lt_dlsetsearchpath() so that we can use relative paths for ODBC + modules in a multiarch-clean manner + * Document the availability of multiarch driver support in debian/NEWS. + * DriverManager/SQLDriverConnect.c: fix a potential buffer overflow. + Closes: #617655 + * debian/rules: update libltdl/config.sub, not just config.sub, when out + of date. Closes: #576980. + * odbcinst1debian2 Breaks the old drivers that reference driver setup + modules in /usr/lib that are shipped in this package, so declare this. + * Standards-Version to 3.9.2. + * Drop .la files from unixodbc-dev, now that there are no shared libraries + left that depend on them. + * Pull patch from Ubuntu to fix FTBFS on ppc64. + * Clean up the odbcinst1debian2 package description. + + -- Steve Langasek Sun, 21 Aug 2011 06:35:23 +0000 + +unixodbc (2.2.14p2-2) unstable; urgency=low + + * Apply patch from + http://cvs.fedoraproject.org/viewvc/devel/unixODBC/odbcint64-config.patch + to ensure we get the necessary (U)ODBCINST64 defines. Thanks to + Matthias Klose for the pointer. Closes: #582591, LP: #620428. + + -- Steve Langasek Fri, 20 Aug 2010 14:51:31 -0700 + +unixodbc (2.2.14p2-1) unstable; urgency=low + + * New upstream release (closes: #433312). + - Fixes compatibility with Oracle driver. Closes: #567521. + - The txt driver has been dropped upstream. + - The prototype of odbcinst_system_file_path has changed, so time for + another package rename to odbcinst1debian2. + - Touch debian/unixodbc.symbols for new interfaces. + * Drop build-dependencies on flex-old and bison, no longer used. + * Build-conflict with unixodbc-dev, to work around libtool's persistent + relinking problems + * Build-depend on libqt3-compat-headers instead of patching all of the code; + if libqt3-compat-headers ever goes away, we should just switch to Qt4 + instead. + * exe/Makefile.am: don't build dltest, this only works if we're using + the bundled libtool. + * Port AC_LIBTOOL_LANG_CXX_CONFIG changes over to the current + _LT_LANG_CXX_CONFIG macro. + * Build with --without-pth, we want pthreads even if pth is installed in the + build env. + * Fix installation of libnn.so at build time, so we don't ship a dangling + symlink instead. Closes: #563283. + + -- Steve Langasek Wed, 24 Mar 2010 16:22:28 -0700 + +unixodbc (2.2.11-21) unstable; urgency=low + + * Fix short description of odbcinst1debian1 to not refer to the bits that + have been moved to odbcinst. + * Build-depend on libreadline-dev instead of libreadline5-dev, for the + readline6 transition; doesn't interfere with backports, since + libreadline5-dev already provided libreadline-dev. Closes: #553870. + * Copy in the setup libraries correctly, so we don't wind up with dangling + symlinks in the package. Closes: #552161. + + -- Steve Langasek Mon, 02 Nov 2009 03:59:14 -0800 + +unixodbc (2.2.11-20) unstable; urgency=low + + * Split binaries out of odbcinst1debian1 into a new odbcinst package, so + that we aren't in the situation of trying to clean up config files in + the purge target of a shared library package. + + -- Steve Langasek Sun, 06 Sep 2009 13:50:40 -0700 + +unixodbc (2.2.11-19) unstable; urgency=low + + * /etc/odbcinst.ini should not be a conffile. Create it in the postinst + on upgrade instead if it doesn't exist, and remove in postrm purge. + (As a side effect, this means we'll need to split this package for + multiarch, but we already have to do that due to /usr/bin/odbcinst; we + just need to do it sooner rather than later, to avoid purging config + files on library purge...) Closes: #376368. + + -- Steve Langasek Fri, 04 Sep 2009 20:56:00 -0700 + +unixodbc (2.2.11-18) unstable; urgency=low + + * Put the headers back in unixodbc-dev; those are kind of important. + Closes: #544438. + + -- Steve Langasek Mon, 31 Aug 2009 10:20:58 -0700 + +unixodbc (2.2.11-17) unstable; urgency=low + + * Drop dltest from the package description, because it was dropped from the + package two years ago; thanks to Pete Boyd for pointing this out. + Closes: #448610. + * Build-Depend on libltdl-dev instead of libltdl3-dev. Closes: #476452. + * Have unixodbc Suggest: unixodbc-bin, per user request. Closes: #240035. + * Suggest tdsodbc, not libct1. + * Update debhelper compat to 7, adding ${misc:Depends} where needed + * Drop debian/dh_makeshlibs and the .manifest files in favor of the + now-standard dpkg-gensymbols .symbols files + * Rename lintian files to *.lintian-overrides so dh_lintian will take care + of them + * Migrate from dh_movefiles to dh_install + * Switch debian/rules to use dh + * Clean up debian/copyright to be more accurate (and approximate DEP5) + * Fix up menu files for the current section names (Apps->Applications; + Databases->Data Management) + * Neuter the .la files to not net dependency_libs, so that we can + eventually get rid of them entirely + * Drop unused debian/odbcinst_psql.ini file + * Drop unneeded entries in debian/dirs + * Set LDFLAGS=-Wl,-z,defs in debian/rules, to guard against all undefined + symbols + * Fix libodbcinstq1c2's missing dep on libltdl, picked up by the above + change + * Fix libodbctxt to not use undefined "stricmp" function + * Add Homepage field + * Standards-Version to 3.8.3. + + -- Steve Langasek Sun, 30 Aug 2009 18:47:57 -0700 + +unixodbc (2.2.11-16) unstable; urgency=low + + * The "libtool loves me, yes I know, because my upstream tells me so" + release + * Synchronize the local modifications to AC_LIBTOOL_LANG_CXX_CONFIG, + introduced in 2.2.11-14, with the current version from the libtool + package, as used in 2.2.11-15; now we should actually be getting usable + PIC libraries again and building on all archs, not just hurd. + Closes: #434203. + + -- Steve Langasek Thu, 26 Jul 2007 23:56:04 -0700 + +unixodbc (2.2.11-15) unstable; urgency=low + + * Relibtoolize with newest Debian libtool, to add hurd support. + Closes: #407114. + + -- Steve Langasek Fri, 13 Jul 2007 12:28:21 -0700 + +unixodbc (2.2.11-14) unstable; urgency=low + + * Include modified AC_LIBTOOL_LANG_CXX_CONFIG macro in acinclude.m4, + so that libtool -export-symbols actually works with GNU ld for C++ + libs; and update the symbol manifests to match. + Closes: #429600, #342084. + * The libtool version used in the package was updated in the process. + Closes: #366436. + * Replace ${Source-Version} with ${binary:Version}. + * Install lintian overrides for library package names. + * Set LC_MESSAGES=C explicitly in debian/dh_makeshlibs when calling + objdump, so that grep works as intended. Closes: #407062. + + -- Steve Langasek Thu, 28 Jun 2007 07:24:19 -0700 + +unixodbc (2.2.11-13) unstable; urgency=low + + * Pull in an ABI change from unixodbc 2.2.12 for 64-bit platforms; + 2.2.12 hasn't been released yet, but if the ABI is going to change + we should change it sooner rather than later. + * Fix a typo in the odbcinst(1) manpage; thanks to Rowan Rodrik van + der Molen for catching this. Closes: #347362. + + -- Steve Langasek Sat, 8 Apr 2006 00:20:49 -0700 + +unixodbc (2.2.11-12) unstable; urgency=low + + * Remove the last traces of libtemplate from unixodbc-dev. + Closes: #360343. + + -- Steve Langasek Sun, 2 Apr 2006 18:03:04 -0700 + +unixodbc (2.2.11-11) unstable; urgency=low + + * Drop gtkodbcconfig0 and godbcconfig packages; the godbcconfig interface + was never very good (compared to the Qt-based tools in unixodbc-bin) and + doesn't seem to be maintained upstream, the gtkodbcconfig0 package has no + other reverse-depends and now has an RC rpath bug which it just isn't + worth trying to fix. Closes: #136559, #136560, #358142. + * This means we can drop the build-depends on libgnome-dev, gdk-imlib1-dev, + and libgtk1.2-dev as well. + + -- Steve Langasek Tue, 21 Mar 2006 18:07:44 -0800 + +unixodbc (2.2.11-10) unstable; urgency=low + + * One-line patch to sqltypes.h to define BUILD_REAL_64_BIT_MODE explicitly, + instead of depending on the caller to define it; this ensures everyone is + building against the ABI that's actually present in the library, so they + will at minimum get compiler warnings if they get the prototypes wrong. + + -- Steve Langasek Sat, 4 Mar 2006 02:19:44 -0800 + +unixodbc (2.2.11-9) unstable; urgency=low + + * Go ahead and rebuild against libqt3-mt, since unixodbc-dev is + currently uninstallable and the current package version won't reach + testing without rebuilds of some of its reverse-depends. + Closes: #323358. + * Rename libodbcinstq1 to libodbcinstq1c2 for the C++ transition. + + -- Steve Langasek Fri, 9 Sep 2005 03:30:04 -0700 + +unixodbc (2.2.11-8) unstable; urgency=low + + * Fix backslash issue in debian/dh_makeshlibs -- grepping out bogus + symbols didn't work after all + + -- Steve Langasek Sun, 3 Jul 2005 10:40:40 -0700 + +unixodbc (2.2.11-7) unstable; urgency=low + + * The "never-ending fun" release + * Version two of the library symbol manifest format: + - include only weak and global symbols in the manifest, not local + symbols + - demangle C++ symbols so that the names are consistent across + - architectures + - record the __cxa_pure_virtual symbol, which includes the C++ ABI + name (for *most* libs) + - trim the extra symbols that the toolchain is known to add on mips, + mipsel, powerpc, and hppa. + The library manifest should now work across all archs for the vast + majority of libs without the finicky per-arch manifests. + + -- Steve Langasek Sun, 3 Jul 2005 00:07:26 -0700 + +unixodbc (2.2.11-6) unstable; urgency=low + + * Per-arch manifests still needed on ia64, due to all libs picking up + symbols on ia64 even though they don't on any other architecture. :/ + + -- Steve Langasek Thu, 30 Jun 2005 16:05:30 -0700 + +unixodbc (2.2.11-5) unstable; urgency=low + + * And ia64 also needs a per-arch manifest due to compiler-generated + symbols. + * Drop libtemplate.so.1 from the unixodbc package, because it's not + worth all this trouble just for a sample driver that doesn't + actually do anything. + + -- Steve Langasek Wed, 29 Jun 2005 23:02:15 -0700 + +unixodbc (2.2.11-4) unstable; urgency=low + + * once more... powerpc needs per-arch manifests for some + libraries still, due to compiler-generated symbols. + + -- Steve Langasek Sun, 26 Jun 2005 17:31:56 -0700 + +unixodbc (2.2.11-3) unstable; urgency=low + + * Add one final symbol to odbcinst, needed by libodbcinstQ.so.1. + * Add a per-arch manifest for gtkodbcconfig0 as well on mips/mipsel + (irritating compiler-provided symbols...), and one for libobcinstq1 + on m68k due to C++ symbol mangling differences + * Move UnixODBC tools to App/Databases in the Debian menu (from + Apps/Tools). Closes: #230682. + + -- Steve Langasek Thu, 23 Jun 2005 04:19:02 -0700 + +unixodbc (2.2.11-2) unstable; urgency=low + + * Fix library manifest handling to support per-architecture manifest + files, and deal with differences in the format of objdump -T output + between 32-bit and 64-bit architectures + * Add ia64, alpha, amd64, mips, and mipsel manifests for specific + packages, due to architecture differences in the resulting symbol + tables + + -- Steve Langasek Wed, 22 Jun 2005 22:45:18 -0700 + +unixodbc (2.2.11-1) unstable; urgency=low + + * New upstream release (closes: #225572) + - most of the Debian diff merged upstream + - possible fix for segfault connecting with db2 from perl (closes: + #268472) + - libboundparam.so.1 and libodbcextras.so.1 are now dropped from + the unixodbc package (and upstream); not changing the package + name, because the one was sample code and the other had a total of + one exported symbol, named "__extra_func_to_mollify_linker"... + - odbcinst1 is renamed to odbcinst1debian1: symbols have been + dropped (and function prototypes changed) without an upstream + soname change, so we get an ugly package name instead. + - use --enable-ltdllib now instead of --disable-ltdl-install, since + upstream appears to have an option now that does what we want + without hacking configure.in. + * Switch build-depends from flex to flex-old, and add build-depends on + bison. + * Bump build-depends on readline to libreadline5-dev. + * Add ini* to the list of exported symbols from libodbcinst.so + (needed by some applications) + * Drop the obsolete odbcinst1.preinst. + * Drop the dltest command, which is of limited utility to end users + * Integrate new isql(1) manpage provided by Kurt Roeckx (closes: + #236476). + * Drop headers from unixodbc-dev that we shouldn't be installing; + upstream has a working install target, so there's no reason to + overshoot by installing headers manually, and most of the extras + we were installing weren't usable for anything at all. This also + means the Conflicts: with arla-dev can be dropped (closes: #312129). + + -- Steve Langasek Tue, 14 Jun 2005 04:16:42 -0700 + +unixodbc (2.2.4-11) unstable; urgency=low + + * Brown paper bag me: conflicts do not write themselves just because + you add a line to the changelog. + + -- Steve Langasek Fri, 15 Oct 2004 03:07:52 -0700 + +unixodbc (2.2.4-10) unstable; urgency=high + + * High-urgency upload for an RC bugfix. + * Suggest libct1 instead of libct0, since the latter is no more + (closes: #255534). + * Conflict with arla-dev, since both provide /usr/include/log.h (at + least for now). Closes: #274784. + + -- Steve Langasek Tue, 5 Oct 2004 00:07:04 -0700 + +unixodbc (2.2.4-9) unstable; urgency=low + + * Fix a pair of undefined symbols in libodbccr.so that would have + caused linker assertions if this code were ever actually used + (closes: #215974). + + -- Steve Langasek Sat, 24 Jan 2004 16:04:53 -0600 + +unixodbc (2.2.4-8) unstable; urgency=low + + * Fix godbcconfig's section to 'gnome' instead of 'x11'. + * Upgrade to libtool 1.5, so that we can avoid unnecessary linking of + indirect dependencies; should address bugs like #210628. Also + closes: #211106. + + -- Steve Langasek Fri, 12 Sep 2003 10:27:00 -0500 + +unixodbc (2.2.4-7) unstable; urgency=low + + * Suggest libct1 instead of the defunct libct0. + * Provide more detail in long package descriptions (closes: #209667, + #210142). + + -- Steve Langasek Sun, 7 Sep 2003 11:48:34 -0500 + +unixodbc (2.2.4-6) unstable; urgency=low + + * Fix the path passed to dh_shlibdeps, so we actually find our + libraries. + * Make sure SQLLEN and SQLULEN are #defines on 64-bit archs as well, + to make it easier for app build scripts to cope. + * Make unixodbc-dev depend on libltdl3-dev, now that we're using the + external libltdl. + + -- Steve Langasek Sat, 1 Mar 2003 15:01:01 -0600 + +unixodbc (2.2.4-5) unstable; urgency=low + + * Fix the libodbctxt.so problem again: exempt it from the dh_movefiles + list, and also change to using the system libltdl. + + -- Steve Langasek Mon, 24 Feb 2003 20:35:04 -0600 + +unixodbc (2.2.4-4) unstable; urgency=low + + * remove extra directories from unixodbc binary package + * set AM_MAINTAINER_MODE for gODBCConfig, overlooked earlier + + -- Steve Langasek Sun, 23 Feb 2003 20:00:19 -0600 + +unixodbc (2.2.4-3) unstable; urgency=low + + * Address the upload race-condition that had libqt3-headers moving + at the same time I was preparing an upload depending on it. + * Add more 64-bit fixes to the code; now builds cleanly on alpha, + and works with all the drivers that worked before. + + -- Steve Langasek Sun, 23 Feb 2003 12:59:06 -0600 + +unixodbc (2.2.4-2) unstable; urgency=low + + * Fix the build scripts to not depend on xmkmf, and to also + account for changes to autoconf's internal macros between + 2.13 and 2.57. + * While we're at it, add --disable-dependency-tracking to the + configure options; saves time building given that 'make clean' + happens with every invocation of dpkg-buildpackage anyway. + + -- Steve Langasek Wed, 19 Feb 2003 19:37:50 -0600 + +unixodbc (2.2.4-1) unstable; urgency=low + + * New upstream release (closes: #159447). + * Conflict with old versions of remembrance-agent, which included + libtemplate.a (closes: #155101). + * Remove the alpha-specific build flags, since we're now using gcc 3.2. + * Move libodbcinstQ.so into its own package, as part of the C++ ABI + transition (closes: #140733). + * Fix libgtkodbcconfig so that it's properly linked against libs it + depends on. Correspondingly move this helper lib to its own package, + so no one screams at me for forcing the installation of libesd on + their servers. + * shuffle build rules about, to clean up empty dirs in the main + (unixodbc) package. + + -- Steve Langasek Sun, 26 Jan 2003 12:36:05 -0600 + +unixodbc (2.1.1-10) unstable; urgency=low + + * "libtool is my shepherd, I shall not want": try (again!) to get + libtool to behave itself by upgrading to libtool 1.4.2, since it's + now breaking builds on mips and mipsel that worked before. + + -- Steve Langasek Sun, 6 Oct 2002 00:13:58 -0500 + +unixodbc (2.1.1-9) unstable; urgency=low + + * Amend build-deps to point to the new gdk-imlib1-dev package + (closes: #162562). + * Polish the package descriptions for accuracy. + + -- Steve Langasek Fri, 27 Sep 2002 09:14:24 -0500 + +unixodbc (2.1.1-8) unstable; urgency=low + + * Loosen the relationship between unixodbc-dev and the GUI development + packages; for the most part, people developing GUIs should be able + to figure out for themselves what packages they need, without being + strongarmed by dselect. + + -- Steve Langasek Sat, 30 Mar 2002 10:52:17 -0600 + +unixodbc (2.1.1-7) unstable; urgency=low + + * Add manpages for odbcinst(1), ODBCConfig, and gODBCConfig. + Addresses 3 out of 7 lintian errors. + + -- Steve Langasek Sat, 2 Mar 2002 18:06:07 -0600 + +unixodbc (2.1.1-6) unstable; urgency=low + + * Avoid duplication of effort: we no longer ship the postgres driver, + but refer to the odbc-postgresql package instead. + + -- Steve Langasek Thu, 21 Feb 2002 21:14:50 -0600 + +unixodbc (2.1.1-5) unstable; urgency=low + + * The why-do-we-care-about-the-text-driver-anyway? release. + * Since libtool is so completely broken in handling libodbctxt.so, + and since libodbctxt.so is so useless, let's just ignore it. If it + doesn't build, eehhhh. + + -- Steve Langasek Fri, 8 Feb 2002 09:59:55 -0600 + +unixodbc (2.1.1-4) unstable; urgency=low + + * Patch ltmain.sh to handle the 'relinking' issue with libraries + depending on other libraries in the package. (closes: #130030) + * Fix use of libodbcinstQ to look for .so.1 instead of .so when + dlopening. (closes: #129845) + * Tweak to the install target (DESTDIR && !sysconfdir) + * Use GNU-standard arch values when passing to configure. + + -- Steve Langasek Thu, 31 Jan 2002 11:29:00 -0600 + +unixodbc (2.1.1-3) unstable; urgency=low + + * Try to fix the libtool brokenness by using DESTDIR instead of + prefix. + * Make sure Qt support gets built properly on i386 this time + (closes: #129845) + * Add library path to dh_shlibdeps invocation, fix for behavior when + building on a machine where unixodbc is not already installed. + + -- Steve Langasek Mon, 21 Jan 2002 11:28:00 -0600 + +unixodbc (2.1.1-2) unstable; urgency=low + + * Separate odbcinst library into a separate package, so that drivers + can depend on just this package instead of on all of unixodbc. + * Move GUI configure libs and included drivers into subdirectory, + /usr/lib/odbc/ + * Get rid of static versions of plugins, since nothing should link to + them directly. + * Pave the way for automatic install of postgres, txt, nn drivers. + + -- Steve Langasek Mon, 14 Jan 2002 11:08:00 -0600 + +unixodbc (2.1.1-1) unstable; urgency=low + + * New upstream release (closes: 116375 (for real this time)) + * Add build-dep for flex, which was accidentally chopped. + * Build against the multi-threaded version of the Qt library; fixes + possible build problems if libqt-mt is installed in the build + environment but libqt-mt-dev is not. Plus multi-threading is good. + + -- Steve Langasek Thu, 3 Jan 2002 17:01:28 -0600 + +unixodbc (2.0.11-1) unstable; urgency=low + + * New upstream release (closes: 116375) + * Correct spelling of QT to Qt. (closes: 118879) + * Change priority of unixodbc-dev to match the overrides file. + * Remove alpha dependency on gcc-3.0, to keep in sync with Qt packages. + * Add static libs to the -dev package, previously missing. + + -- Steve Langasek Sat, 17 Nov 2001 20:04:34 -0600 + +unixodbc (2.0.8-4) unstable; urgency=low + + * change unixodbc's preinst to only move files out of /etc/unixodbc + that match the names of known config files. This addresses problems + reported when /etc is under control of CVS, and also prevents + accidental overwriting of existing files in /etc. (closes: 117873) + + -- Steve Langasek Fri, 2 Nov 2001 16:41:00 -0600 + +unixodbc (2.0.8-3) unstable; urgency=low + + * cosmetic fix to package descriptions (closes: 110196) + * manually specify {host,build} arch, eliminating need for config.guess. + + -- Steve Langasek Mon, 27 Aug 2001 12:15:00 -0500 + +unixodbc (2.0.8-2) unstable; urgency=low + + * Fix alpha build now that qt is better-supported + * Fix config.{guess,sub} in the gODBCConfig subdirectory + + -- Steve Langasek Tue, 10 Jul 2001 20:18:00 -0500 + +unixodbc (2.0.8-1) unstable; urgency=low + + * New upstream release + * Set up build rules to always use the local config.{guess,sub} scripts or + the ones installed on the system, whichever are newer (closes: #103381) + + -- Steve Langasek Tue, 10 Jul 2001 16:40:28 -0500 + +unixodbc (2.0.5-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Run libtoolize to get support for new architectures. Closes: #103381 + + -- LaMont Jones Mon, 9 Jul 2001 21:39:34 -0600 + +unixodbc (2.0.5-2) unstable; urgency=low + + * New maintainer (closes: #89581) + * Removed indirect build-dependencies; let the packages we depend on pick + those up. + * Removed unnecessary unixodbc-dev dependency on libc6-dev, which is + build-essential and not cross-platform. + * temporarily disable building of Qt GUI tools on alpha until we have a + working compiler. + + -- Steve Langasek Sun, 20 May 2001 21:35:00 -0500 + +unixodbc (2.0.5-1) unstable; urgency=low + + * Removed build-dependency on libdb2-dev, since libgnoem-dev already + depends on libdb3-dev. (closes: #96985) + + -- Bas Zoetekouw Fri, 11 May 2001 15:14:02 +0200 + +unixodbc (2.0.5-0.1) unstable; urgency=low + + * NMU + * New upstream version + * Update maintainer field + + -- Ivan E. Moore II Wed, 18 Apr 2001 02:30:00 -0700 + +unixodbc (2.0.4-4) unstable; urgency=low + + * Changing maintainer to Debian QA + + -- Ivan E. Moore II Wed, 14 Mar 2001 00:18:00 -0700 + +unixodbc (2.0.4-3) unstable; urgency=low + + * Update Build-Depends to force build with new qt + * Build against new qt package + * Remove versioned depends + + -- Ivan E. Moore II Fri, 23 Feb 2001 09:48:00 -0700 + +unixodbc (2.0.4-2) unstable; urgency=low + + * Fix Build-Depends to reflect new libqt-dev package + * Remove undocumented links + * update shlibs since I forgot to do it before + * Update recommends for -dev package + + -- Ivan E. Moore II Mon, 19 Feb 2001 03:11:00 -0700 + +unixodbc (2.0.4-1) unstable; urgency=low + + * New upstream version + * Fix postgres socket again (Closes: #85262) + + -- Ivan E. Moore II Fri, 09 Feb 2001 04:15:00 -0700 + +unixodbc (2.0.3-2) unstable; urgency=low + + * Cleanup build-depends adding a couple missing ones + * Fixing shlibs + + -- Ivan E. Moore II Tue, 23 Jan 2001 23:43:00 -0700 + +unixodbc (2.0.3-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II Wed, 17 Jan 2001 09:54:00 -0700 + +unixodbc (2.0.2-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II Sat, 13 Jan 2001 02:50:00 -0700 + +unixodbc (2.0.1-1) unstable; urgency=low + + * New upstream version + * Adding in menus + + -- Ivan E. Moore II Sun, 07 Jan 2001 05:20:00 -0700 + +unixodbc (1.8.13.0-1) unstable; urgency=low + + * New upstream stable release - woh I got behind + * Build against new qt + * More work on build-depends + + -- Ivan E. Moore II Wed, 13 Dec 2000 18:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.9) unstable; urgency=low + + * More dependency work + * Build against new qt + + -- Ivan E. Moore II Wed, 13 Dec 2000 18:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.7) unstable; urgency=low + + * Building against new qt and xlibs + + -- Ivan E. Moore II Sat, 04 Nov 2000 14:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.6) unstable; urgency=low + + * Updating libmyodbc suggest + + -- Ivan E. Moore II Mon, 23 Oct 2000 17:54:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.5) unstable; urgency=low + + * Including missing header files (Closes: #75393) + + -- Ivan E. Moore II Mon, 23 Oct 2000 12:47:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.4) unstable; urgency=low + + * Fixing m68k build and others by removing dup movefiles listing + + -- Ivan E. Moore II Thu, 19 Oct 2000 21:00:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.3) unstable; urgency=low + + * Changing recommends to suggests (Closes: #72763) + * Building against qt 2.2.1 + + -- Ivan E. Moore II Sun, 08 Oct 2000 05:00:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.2) unstable; urgency=low + + * Fixing perm problem with configure + + -- Ivan E. Moore II Tue, 26 Sep 2000 22:30:00 -0700 + +unixodbc (1.8.13-0.cvs20000926.1) unstable; urgency=low + + * New upstream cvs version + + -- Ivan E. Moore II Tue, 26 Sep 2000 17:30:00 -0700 + +unixodbc (1.8.12-8) unstable; urgency=low + + * More build-depends fixes + * Adding in a Recommend for libmyodbc2.50.26 + + -- Ivan E. Moore II Mon, 25 Sep 2000 16:45:00 -0700 + +unixodbc (1.8.12-7) unstable; urgency=low + + * Fixing conffile problem...oops + + -- Ivan E. Moore II Wed, 20 Sep 2000 17:00:00 -0700 + +unixodbc (1.8.12-6) unstable; urgency=low + + * Fixing Driver location problem (Closes: #71725) + + -- Ivan E. Moore II Mon, 18 Sep 2000 21:30:00 -0700 + +unixodbc (1.8.12-5) unstable; urgency=low + + * Fixing Postgres socket (Closes: #71740) + + -- Ivan E. Moore II Mon, 18 Sep 2000 16:45:00 -0700 + +unixodbc (1.8.12-4) unstable; urgency=low + + * Adding in a conflict for libiodbc-dev (Closes: #71342) + + -- Ivan E. Moore II Mon, 11 Sep 2000 03:30:00 -0700 + +unixodbc (1.8.12-3) unstable; urgency=low + + * Fixing a dangling .so file + + -- Ivan E. Moore II Sun, 10 Sep 2000 01:00:00 -0700 + +unixodbc (1.8.12-2) unstable; urgency=low + + * Fixing global section + + -- Ivan E. Moore II Fri, 08 Sep 2000 02:30:00 -0700 + +unixodbc (1.8.12-1) unstable; urgency=low + + * Initial Release. + + -- Ivan E. Moore II Sat, 26 Aug 2000 02:53:23 -0600 + +Local variables: +mode: debian-changelog +End: --- unixodbc-gui-qt-2.3.0.orig/debian/ODBCConfig.1 +++ unixodbc-gui-qt-2.3.0/debian/ODBCConfig.1 @@ -0,0 +1,26 @@ +.TH ODBCConfig 1 "2nd Mar 2002" UnixODBC "UnixODBC Reference" +.SH NAME +ODBCConfig \- Qt-based ODBC Data Source Administrator +.SH SYNOPSIS +.B ODBCConfig +.RI "[ " generic-options " ]" +.SH DESCRIPTION +This manual page documents briefly the +.B ODBCConfig +command. This manual page was written for the Debian GNU/Linux +distribution because the original program does not have a manual page. +.PP +.B ODBCConfig +is a graphical configuration tool that allows configuration of ODBC +drivers (as the superuser) and Data Source Names (as any user). +Configuration of File, System, and User DSNs is supported, using the +graphical driver +.I setup libraries +provided by unixODBC. +.SH FILES +.IR /etc/odbcinst.ini ", " /etc/odbc.ini ", " $HOME/.odbc.ini +.SH AUTHOR +This manual page was written by Steve Langasek for +the Debian package of unixODBC. +.SH SEE ALSO +.BR odbcinst(1) ", " gODBCConfig(1) --- unixodbc-gui-qt-2.3.0.orig/debian/NEWS +++ unixodbc-gui-qt-2.3.0/debian/NEWS @@ -0,0 +1,17 @@ +unixodbc (2.2.14p2-3) unstable; urgency=low + + * Multiarch directory added to search path + + In order to support installation of ODBC drivers for multiple + architectures at once and to enable architecture-neutral odbcinst.ini to + locate these drivers, libodbc now adds /usr/lib/$arch/odbc to its + internal search path. Drivers installed to this directory can be + referred to with a relative filename in odbcinst.ini, and libodbc will + automatically look in the correct library for this architecture. + + Drivers using such relative paths in their odbcinst.ini settings should + declare Breaks: unixodbc (<< 2.2.14p2-3), odbcinst1debian2 (<< + 2.2.14p2-3), libiodbc2. (This logic may be implemented in libiodbc2 at + a later date.) + + -- Steve Langasek Sat, 20 Aug 2011 14:57:15 -0700 --- unixodbc-gui-qt-2.3.0.orig/debian/unixodbc-bin.menu +++ unixodbc-gui-qt-2.3.0/debian/unixodbc-bin.menu @@ -0,0 +1,11 @@ +?package(unixodbc-bin):\ + needs="x11"\ + section="Applications/System/Administration"\ + title="ODBCCreateDataSourceQ4"\ + command="ODBCCreateDataSourceQ4" + +?package(unixodbc-bin):\ + needs="x11"\ + section="Applications/System/Administration"\ + title="ODBCManageDataSourcesQ4"\ + command="ODBCManageDataSourcesQ4" --- unixodbc-gui-qt-2.3.0.orig/debian/compat +++ unixodbc-gui-qt-2.3.0/debian/compat @@ -0,0 +1 @@ +9 --- unixodbc-gui-qt-2.3.0.orig/debian/unixodbc-dev.install +++ unixodbc-gui-qt-2.3.0/debian/unixodbc-dev.install @@ -0,0 +1,11 @@ +usr/lib/*/libgtrtst.so +usr/lib/*/libodbc.so +usr/lib/*/libodbccr.so +usr/lib/*/libodbcinst.so +usr/lib/*/libodbcinstQ4.so +usr/lib/*/libgtrtst.a +usr/lib/*/libodbc.a +usr/lib/*/libodbccr.a +usr/lib/*/libodbcinst.a +usr/lib/*/libodbcinstQ4.a +usr/include/* --- unixodbc-gui-qt-2.3.0.orig/debian/docs +++ unixodbc-gui-qt-2.3.0/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README --- unixodbc-gui-qt-2.3.0.orig/debian/rules +++ unixodbc-gui-qt-2.3.0/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f +# Copyright 2009 Steve Langasek + +# build should fail if anything at all is wrong with the library symbols +export DPKG_GENSYMBOLS_CHECK_LEVEL=4 +# always force the check for undefined symbols +export LDFLAGS=-Wl,-z,defs + +%: + dh $@ + +override_dh_auto_configure: autotools + # Add here commands to configure the package. + CXXFLAGS="-g -O2 -pipe" \ + dh_auto_configure -- --with-qt_dir_include=/usr/include/qt4 \ + --enable-static --without-pth + # clean sources to remove all moc-autogenerated files, + # without which this won't build with Qt4. + make clean + +override_dh_auto_clean: + dh_auto_clean + +override_dh_auto_install: + dh_auto_install + +# The autotools target adds a forced build-time dependency on +# autotools-dev (for /usr/share/misc/config.*) +autotools: + OLDDATESUB=`./config.sub -t | tr -d - ` || OLDDATESUB=""; \ + NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d - `; \ + if [ -z "$$OLDDATESUB" ] || [ "$$OLDDATESUB" -lt "$$NEWDATESUB" ]; \ + then \ + cp -f /usr/share/misc/config.sub config.sub; \ + fi --- unixodbc-gui-qt-2.3.0.orig/debian/clean +++ unixodbc-gui-qt-2.3.0/debian/clean @@ -0,0 +1,7 @@ +# this symlink seems not to be cleaned properly. +config.status +# cleaning up after autotools-dev +config.sub +# autogenerated files that should also be cleaned upstream but aren't +ODBCConfig/mclass*.cpp +DataManager/mclass*.cpp --- unixodbc-gui-qt-2.3.0.orig/debian/copyright +++ unixodbc-gui-qt-2.3.0/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Ivan E. Moore II on +Sat, 26 Aug 2000 02:53:23 -0600. + +It was downloaded from http://www.unixodbc.org/ + +Upstream Authors: Please see AUTHORS file for full list + +Files: * +Copyright: 1999-2005 Nick Gorham , + Peter Harvey , et al. +License: LGPL-2+ + +Files: ODBCTestQ4/* +Copyright: 1999-2005 Nick Gorham , + Peter Harvey , et al. +License: GPL-2+ + +Files: ODBCTestQ4/DlgToolsManageAutoTest.cpp ODBCTestQ4/DlgToolsManageTest.cpp + ODBCTestQ4/DlgToolsManageTestGroup.cpp ODBCTestQ4/DlgToolsNewGroup.cpp + ODBCTestQ4/DlgToolsNewSource.cpp ODBCTestQ4/DlgToolsRunAutoTests.cpp + ODBCTestQ4/OdbcHandle.cpp ODBCTestQ4/OdbcHandle.h + ODBCTestQ4/OdbcTest.cpp ODBCTestQ4/OdbcTest.h ODBCTestQ4/main.cpp + ODBCTestQ4/results.cpp ODBCTestQ4/stmt.cpp +Copyright: 1999-2005 Nick Gorham , + Peter Harvey , et al. +License: LGPL-2+ + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + On Debian GNU/Linux systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL'. + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. --- unixodbc-gui-qt-2.3.0.orig/debian/libodbcinstq4-1.install +++ unixodbc-gui-qt-2.3.0/debian/libodbcinstq4-1.install @@ -0,0 +1,2 @@ +usr/lib/*/libodbcinstQ4.so.* + --- unixodbc-gui-qt-2.3.0.orig/debian/dirs +++ unixodbc-gui-qt-2.3.0/debian/dirs @@ -0,0 +1 @@ +usr/lib/odbc --- unixodbc-gui-qt-2.3.0.orig/debian/source.lintian-overrides +++ unixodbc-gui-qt-2.3.0/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +# ignorable, we don't use this directory for anything +unixodbc source: ancient-libtool Drivers/MySQL/ltconfig --- unixodbc-gui-qt-2.3.0.orig/debian/control +++ unixodbc-gui-qt-2.3.0/debian/control @@ -0,0 +1,33 @@ +Source: unixodbc-gui-qt +Build-Depends: debhelper (>= 8.1.3~), libqt4-dev, libqtassistantclient-dev, + libreadline-dev, autotools-dev, libltdl-dev, unixodbc-dev +Section: libs +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Steve Langasek +Standards-Version: 3.9.2 +Homepage: http://www.unixodbc.org/ +Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/users/vorlon/unixodbc-gui-qt/trunk/ +Vcs-Browser: http://anonscm.debian.org/loggerhead/users/vorlon/unixodbc-gui-qt/trunk/ + +Package: unixodbc-bin +Architecture: any +Multi-Arch: foreign +Section: x11 +Depends: ${shlibs:Depends}, libodbcinstq4-1, ${misc:Depends} +Description: Graphical tools for ODBC management and browsing + This package contains three graphical applications for use with + unixODBC, the Open DataBase Connectivity suite: ODBCConfig, a graphical + configuration tool for managing database drivers and access to + individual databases; DataManager, a simple browser and query tool for + ODBC databases; and odbctest, a tool for testing the ODBC API itself. + +Package: libodbcinstq4-1 +Architecture: any +Multi-Arch: same +Section: libs +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Qt-based ODBC configuration library + This package contains the libodbcinstQ4 library, a library used by some + Qt-based GUI configuration tools for managing ODBC drivers and ODBC DSNs. --- unixodbc-gui-qt-2.3.0.orig/debian/libodbcinstq4-1.symbols +++ unixodbc-gui-qt-2.3.0/debian/libodbcinstq4-1.symbols @@ -0,0 +1,4 @@ +libodbcinstQ4.so.1 libodbcinstq4-1 #MINVER# + ODBCCreateDataSource@Base 2.2.14p2 + ODBCDriverConnectPrompt@Base 2.3.0 + ODBCManageDataSources@Base 2.2.14p2 --- unixodbc-gui-qt-2.3.0.orig/gtrtstQ4/gtrtstQ4.exp +++ unixodbc-gui-qt-2.3.0/gtrtstQ4/gtrtstQ4.exp @@ -0,0 +1,2 @@ +szLogPrintf +szMessageBox --- unixodbc-gui-qt-2.3.0.orig/gtrtstQ4/Makefile.am +++ unixodbc-gui-qt-2.3.0/gtrtstQ4/Makefile.am @@ -7,6 +7,8 @@ -export-symbols @srcdir@/gtrtstQ4.exp \ -module +libgtrtstQ4_la_LIBADD = $(QT_LIBS) + INCLUDES = -I@top_srcdir@/ini \ $(INCLUDES_COMMON) \ $(QT_CXXFLAGS) \ --- unixodbc-gui-qt-2.3.0.orig/gtrtstQ4/Makefile.in +++ unixodbc-gui-qt-2.3.0/gtrtstQ4/Makefile.in @@ -67,7 +67,8 @@ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libgtrtstQ4_la_LIBADD = +am__DEPENDENCIES_1 = +libgtrtstQ4_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libgtrtstQ4_la_OBJECTS = szLogPrintf.lo szMessageBox.lo libgtrtstQ4_la_OBJECTS = $(am_libgtrtstQ4_la_OBJECTS) libgtrtstQ4_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -186,11 +187,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ @@ -255,6 +251,7 @@ -export-symbols @srcdir@/gtrtstQ4.exp \ -module +libgtrtstQ4_la_LIBADD = $(QT_LIBS) INCLUDES = -I@top_srcdir@/ini \ $(INCLUDES_COMMON) \ $(QT_CXXFLAGS) \ --- unixodbc-gui-qt-2.3.0.orig/ODBCManageDataSourcesQ4/Makefile.in +++ unixodbc-gui-qt-2.3.0/ODBCManageDataSourcesQ4/Makefile.in @@ -166,11 +166,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ --- unixodbc-gui-qt-2.3.0.orig/ini/ini.h +++ unixodbc-gui-qt-2.3.0/ini/ini.h @@ -0,0 +1,477 @@ +/********************************************************************************** + * ini.h + * + * Include file for libini.a. Coding? Include this and link against libini.a. + * + * + ************************************************** + * This code was created by Peter Harvey @ CodeByDesign. + * Released under LGPL 28.JAN.99 + * + * Contributions from... + * ----------------------------------------------- + * Peter Harvey - pharvey@codebydesign.com + **************************************************/ + +#ifndef INCLUDED_INI_H +#define INCLUDED_INI_H + +/*********[ CONSTANTS AND TYPES ]**************************************************/ +#include +#include +#include +#include + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#define STDINFILE ((char*)-1) + +#define INI_NO_DATA 2 +#define INI_SUCCESS 1 +#define INI_ERROR 0 + +#define INI_MAX_LINE 1000 +#define INI_MAX_OBJECT_NAME INI_MAX_LINE +#define INI_MAX_PROPERTY_NAME INI_MAX_LINE +#define INI_MAX_PROPERTY_VALUE INI_MAX_LINE + +#if HAVE_LIMITS_H +#include +#endif + +#ifdef PATH_MAX +#define ODBC_FILENAME_MAX PATH_MAX +#elif MAXPATHLEN +#define ODBC_FILENAME_MAX MAXPATHLEN +#else +#define ODBC_FILENAME_MAX FILENAME_MAX +#endif + +/******************************************** + * tINIPROPERTY + * + * Each property line has Name=Value pair. + * They are stored in this structure and linked together to provide a list + * of all properties for a given Object. + ********************************************/ + +typedef struct tINIPROPERTY +{ + struct tINIPROPERTY *pNext; + struct tINIPROPERTY *pPrev; + + char szName[INI_MAX_PROPERTY_NAME+1]; + char szValue[INI_MAX_PROPERTY_VALUE+1]; + +} INIPROPERTY, *HINIPROPERTY; + +/******************************************** + * tINIOBJECT + * + * Each object line has just an object name. This structure + * stores the object name and its subordinate information. + * The lines that follow are considered to be properties + * and are stored in a list of tINIPROPERTY. + ********************************************/ + +typedef struct tINIOBJECT +{ + struct tINIOBJECT *pNext; + struct tINIOBJECT *pPrev; + + char szName[INI_MAX_OBJECT_NAME+1]; + + HINIPROPERTY hFirstProperty; + HINIPROPERTY hLastProperty; + int nProperties; + +} INIOBJECT, *HINIOBJECT; + +/******************************************** + * tINI + * + * Each INI file contains a list of objects. This + * structure stores each object in a list of tINIOBJECT. + ********************************************/ + +typedef struct tINI +{ +#ifdef __OS2__ + int iniFileType; /* ini file type 0 = text, 1 = binary (OS/2 only) */ +#endif + char szFileName[ODBC_FILENAME_MAX+1]; /* FULL INI FILE NAME */ + char cComment[ 5 ]; /* COMMENT CHAR MUST BE IN FIRST COLUMN */ + char cLeftBracket; /* BRACKETS DELIMIT THE OBJECT NAME, THE LEFT BRACKET MUST BE IN COLUMN ONE */ + char cRightBracket; + char cEqual; /* SEPERATES THE PROPERTY NAME FROM ITS VALUE */ + int bChanged; /* IF true, THEN THE WHOLE FILE IS OVERWRITTEN UPON iniCommit */ + int bReadOnly; /* TRUE IF AT LEAST ONE CALL HAS BEEN MADE TO iniAppend() */ + + HINIOBJECT hFirstObject; + HINIOBJECT hLastObject; + HINIOBJECT hCurObject; + int nObjects; + + HINIPROPERTY hCurProperty; + +} INI, *HINI; + +/******************************************** + * tINIBOOKMARK + * + * Used to store the current Object and Property pointers so + * that the caller can quickly return to some point in the + * INI data. + ********************************************/ + +typedef struct tINIBOOKMARK +{ + HINI hIni; + HINIOBJECT hCurObject; + HINIPROPERTY hCurProperty; + +} INIBOOKMARK, *HINIBOOKMARK; + +#if defined(__cplusplus) + extern "C" { +#endif + +/*********[ PRIMARY INTERFACE ]*****************************************************/ + +/****************************** + * iniOpen + * + * 1. make sure file exists + * 2. allocate memory for HINI + * 3. initialize HINI + * 4. load entire file into structured memory + * 5. set TRUE if you want to create file if non-existing + ******************************/ +#ifdef __OS2__ +int iniOpen( HINI *hIni, char *pszFileName, char *cComment, char cLeftBracket, char cRightBracket, char cEqual, int bCreate, int bFileType ); +#else +int iniOpen( HINI *hIni, char *pszFileName, char *cComment, char cLeftBracket, char cRightBracket, char cEqual, int bCreate ); +#endif +/****************************** + * iniAppend + * + * 1. append Sections in pszFileName that do not already exist in hIni + * 2. Makes hIni ReadOnly! + ******************************/ +int iniAppend( HINI hIni, char *pszFileName ); + +/****************************** + * iniDelete + * + * 1. simple removes all objects (and their properties) from the list using iniObjectDelete() in a loop + ******************************/ +int iniDelete( HINI hIni ); + +/****************************** + * iniClose + * + * 1. free memory previously allocated for HINI + * 2. DO NOT SAVE ANY CHANGES (see iniCommit) + ******************************/ +int iniClose( HINI hIni ); + +/****************************** + * iniCommit + * + * 1. replaces file contents with memory contents (overwrites the file) + ******************************/ +int iniCommit( HINI hIni ); + +/****************************** + * iniObjectFirst + * + ******************************/ +int iniObjectFirst( HINI hIni ); + +/****************************** + * iniObjectLast + * + ******************************/ +int iniObjectLast( HINI hIni ); + +/****************************** + * iniObjectNext + * + * 1. iniObjects() if no current object name else + * 2. find and store next object name + ******************************/ +int iniObjectNext( HINI hIni ); + +/****************************** + * iniObjectSeek + * + * 1. find and store object name + ******************************/ +int iniObjectSeek( HINI hIni, char *pszObject ); + +/****************************** + * iniObjectSeekSure + * + * 1. find and store object name + * 2. ensure that it exists + ******************************/ +int iniObjectSeekSure( HINI hIni, char *pszObject ); + +/****************************** + * iniObjectEOL + * + ******************************/ +int iniObjectEOL( HINI hIni ); + +/****************************** + * iniObject + * + * 1. returns the current object name + ******************************/ +int iniObject( HINI hIni, char *pszObject ); + +/****************************** + * iniObjectDelete + * + * 1. deletes current Object + ******************************/ +int iniObjectDelete( HINI hIni ); + +/****************************** + * iniObjectUpdate + * + * 1. update current Object + ******************************/ +int iniObjectUpdate( HINI hIni, char *pszObject ); + +/****************************** + * iniPropertyObject + * + * 1. inserts a new Object + * 2. becomes current + ******************************/ +int iniObjectInsert( HINI hIni, char *pszObject ); + +/****************************** + * iniPropertyFirst + * + ******************************/ +int iniPropertyFirst( HINI hIni ); + +/****************************** + * iniPropertyLast + * + ******************************/ +int iniPropertyLast( HINI hIni ); + +/****************************** + * iniPropertyNext + * + * 1. iniProperties() if no current property name else + * 2. find and store next property name + ******************************/ +int iniPropertyNext( HINI hIni ); + +/****************************** + * iniPropertySeek + * + * 1. set current Object & Property positions where matching parameters + * 2. any parms which are empty strings (ie pszObject[0]) are ignored + * 3. it is kinda pointless to pass empty strings for all parms... you will get 1st Property in 1st Object + ******************************/ +int iniPropertySeek( HINI hIni, char *pszObject, char *pszProperty, char *pszValue ); + +/****************************** + * iniPropertySeekSure + * + * 1. same as iniPropertySeek but + * 2. will ensure that both Object and Property exist + ******************************/ +int iniPropertySeekSure( HINI hIni, char *pszObject, char *pszProperty, char *pszValue ); + +/****************************** + * iniPropertyEOL + * + ******************************/ +int iniPropertyEOL( HINI hIni ); + +/****************************** + * iniProperty + * + * 1. returns the current property name + ******************************/ +int iniProperty( HINI hIni, char *pszProperty ); + +/****************************** + * iniPropertyDelete + * + * 1. deletes current Property + ******************************/ +int iniPropertyDelete( HINI hIni ); + +/****************************** + * iniPropertyUpdate + * + * 1. update current Property + ******************************/ +int iniPropertyUpdate( HINI hIni, char *pszProperty, char *pszValue ); + +/****************************** + * iniPropertyInsert + * + * 1. inserts a new Property for current Object + * 2. becomes current + ******************************/ +int iniPropertyInsert( HINI hIni, char *pszProperty, char *pszValue ); + +/****************************** + * iniValue + * + * 1. returns the value for the current object/property + ******************************/ +int iniValue( HINI hIni, char *pszValue ); + +/****************************** + * iniGetBookmark + * + * 1. Store the current data positions (Object and Property) + * into hIniBookmark. + * 2. Does not allocate memory for hIniBookmark so pass a + * pointer to a valid bookmark. + ******************************/ +int iniGetBookmark( HINI hIni, HINIBOOKMARK hIniBookmark ); + +/****************************** + * iniGotoBookmark + * + * 1. Sets the current Object and Property positions to + * those stored in IniBookmark. + * 2. Does not account for the bookmark becoming + * invalid ie from the Object or Property being deleted. + ******************************/ +int iniGotoBookmark( INIBOOKMARK IniBookmark ); + +/****************************** + * iniCursor + * + * 1. Returns a copy of the hIni with a new + * set of position cursors (current Object and Property). + * 2. Not safe to use when in the possibility of + * deleting data in another cursor on same data. + * 3. Use when reading data only. + * 4. Does not allocate memory so hIniCursor should be valid. + * 5. All calls, other than those for movement, are + * global and will affect any other view of the data. + ******************************/ +int iniCursor( HINI hIni, HINI hIniCursor ); + +/*************************************************************************************/ +/*********[ SUPPORT FUNCS ]***********************************************************/ +/*************************************************************************************/ + +/****************************** + * iniElement + * + ******************************/ +int iniElement( char *pszData, char cSeperator, char cTerminator, int nElement, char *pszElement, int nMaxElement ); +int iniElementMax( char *pData, char cSeperator, int nDataLen, int nElement, char *pszElement, int nMaxElement ); +int iniElementToEnd( char *pszData, char cSeperator, char cTerminator, int nElement, char *pszElement, int nMaxElement ); +int iniElementEOL( char *pszData, char cSeperator, char cTerminator, int nElement, char *pszElement, int nMaxElement ); + +/****************************** + * iniElementCount + * + ******************************/ +int iniElementCount( char *pszData, char cSeperator, char cTerminator ); + +/****************************** + * iniPropertyValue + * + * 1. returns the property value for pszProperty in pszValue + * 2. pszString example; + * "PropertyName1=Value1;PropertyName2=Value2;..." + * 3. cEqual is usually '=' + * 4. cPropertySep is usually ';' + * + * This function can be called without calling any other functions in this lib. + ******************************/ +int iniPropertyValue( char *pszString, char *pszProperty, char *pszValue, char cEqual, char cPropertySep ); + +/****************************** + * iniAllTrim + * + * 1. trims blanks, tabs and newlines from start and end of pszString + * + * This function can be called without calling any other functions in this lib. + ******************************/ +int iniAllTrim( char *pszString ); + +/****************************** + * iniToUpper + * + * 1. Converts all chars in pszString to upper case. + * + * This function can be called without calling any other functions in this lib. + ******************************/ +int iniToUpper( char *pszString ); + + +/****************************** + * _iniObjectRead + * + ******************************/ +int _iniObjectRead( HINI hIni, char *szLine, char *pszObjectName ); + +/****************************** + * _iniPropertyRead + * + ******************************/ +int _iniPropertyRead( HINI hIni, char *szLine, char *pszPropertyName, char *pszPropertyValue ); + +/****************************** + * _iniDump + * + ******************************/ +int _iniDump( HINI hIni, FILE *hStream ); + +/****************************** + * _iniScanUntilObject + * + ******************************/ +int _iniScanUntilObject( HINI hIni, FILE *hFile, char *pszLine ); +int _iniScanUntilNextObject( HINI hIni, FILE *hFile, char *pszLine ); + +/* + * Some changes to avoid a 255 file handle limit, thanks MQJoe. + * Make it conditional as it does have some performance impact esp with LARGE ini files (like what I have :-) + */ + +#if defined( HAVE_VSNPRINTF ) && defined( USE_LL_FIO ) + +FILE *uo_fopen( const char *filename, const char *mode ); +int uo_fclose( FILE *stream ); +char *uo_fgets( char *szbuffer, int n, FILE *stream ); +int uo_fprintf( FILE *stream, const char *fmt, ...); +int uo_vfprintf( FILE *stream, const char *fmt, va_list ap); + +#else + +#define uo_fopen fopen +#define uo_fclose fclose +#define uo_fgets fgets +#define uo_fprintf fprintf +#define uo_vfprintf vfprintf + +#endif + +#if defined(__cplusplus) + } +#endif + +#endif --- unixodbc-gui-qt-2.3.0.orig/ini/Makefile.in +++ unixodbc-gui-qt-2.3.0/ini/Makefile.in @@ -175,11 +175,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ --- unixodbc-gui-qt-2.3.0.orig/odbcinstQ4/odbcinstQ4.exp +++ unixodbc-gui-qt-2.3.0/odbcinstQ4/odbcinstQ4.exp @@ -1,4 +1,3 @@ ODBCCreateDataSource ODBCDriverConnectPrompt ODBCManageDataSources - --- unixodbc-gui-qt-2.3.0.orig/odbcinstQ4/Makefile.in +++ unixodbc-gui-qt-2.3.0/odbcinstQ4/Makefile.in @@ -207,11 +207,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ --- unixodbc-gui-qt-2.3.0.orig/ODBCTestQ4/conn.cpp +++ unixodbc-gui-qt-2.3.0/ODBCTestQ4/conn.cpp @@ -3113,9 +3113,9 @@ */ if ( !hand ) { - pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv )); + pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv, NULL, SQL_NULL_HANDLE )); } - pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc )); + pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc, NULL, SQL_NULL_HANDLE )); pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_STMT, hstmt, pOdbcTest->listHandle )); pOdbcTest->out_win->append( "Full Connect Succeeded\n" ); @@ -4058,7 +4058,7 @@ txt.sprintf( " *phdbc: %p", hdbc ); pOdbcTest->out_win->append( txt ); - pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc ) ); + pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc, NULL, SQL_NULL_HANDLE ) ); } pOdbcTest->out_win->append( "" ); --- unixodbc-gui-qt-2.3.0.orig/ODBCTestQ4/DlgEnvAllocEnv.cpp +++ unixodbc-gui-qt-2.3.0/ODBCTestQ4/DlgEnvAllocEnv.cpp @@ -63,7 +63,7 @@ txt.sprintf( " *phenv: %p", henv ); pOdbcTest->out_win->append( txt ); - pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv ) ); + pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv, NULL, SQL_NULL_HANDLE ) ); } pOdbcTest->out_win->append( "" ); --- unixodbc-gui-qt-2.3.0.orig/ODBCTestQ4/ODBCTestQ4-48.xpm +++ unixodbc-gui-qt-2.3.0/ODBCTestQ4/ODBCTestQ4-48.xpm @@ -0,0 +1,453 @@ +/* XPM */ +static const char * xpmODBCTestQ4_48[] = { +"48 48 402 2", +" c None", +". c #974C2E", +"+ c #9A4D2F", +"@ c #9C4F31", +"# c #9D5032", +"$ c #9D4F31", +"% c #9C4E30", +"& c #994E2F", +"* c #954F30", +"= c #B3130A", +"- c #CC1E1E", +"; c #D01F1F", +"> c #D21F1F", +", c #D52A2A", +"' c #D42323", +") c #D31F1F", +"! c #CC2121", +"~ c #9F2812", +"{ c #B80E06", +"] c #CA0000", +"^ c #CF0000", +"/ c #D20202", +"( c #E87E7E", +"_ c #F6D0D0", +": c #E88181", +"< c #D20000", +"[ c #CB0101", +"} c #A22610", +"| c #BC0E06", +"1 c #CE0000", +"2 c #D50202", +"3 c #E14545", +"4 c #F1A3A3", +"5 c #E24C4C", +"6 c #D60000", +"7 c #D40000", +"8 c #D00101", +"9 c #A7240F", +"0 c #C00E06", +"a c #D50404", +"b c #EE9898", +"c c #FEFAFA", +"d c #FEFEFE", +"e c #F7CECE", +"f c #E24242", +"g c #D70000", +"h c #D40101", +"i c #AB240E", +"j c #973116", +"k c #C63A35", +"l c #C40E06", +"m c #D50000", +"n c #E35454", +"o c #F4B9B9", +"p c #F9D9D9", +"q c #FCEDED", +"r c #FAE1E1", +"s c #DB0303", +"t c #D80101", +"u c #AF250F", +"v c #9D351A", +"w c #C82F2C", +"x c #C80503", +"y c #CF0909", +"z c #DA3435", +"A c #C74237", +"B c #C90E06", +"C c #D90101", +"D c #ED8B8B", +"E c #FBE6E6", +"F c #DF2F2F", +"G c #F19F9F", +"H c #F3ADAD", +"I c #EE8787", +"J c #DD0707", +"K c #DC0101", +"L c #B4250F", +"M c #C6261E", +"N c #D41919", +"O c #CE0808", +"P c #C3231C", +"Q c #B11E0C", +"R c #D40202", +"S c #D90000", +"T c #DB0000", +"U c #DF1010", +"V c #E53D3D", +"W c #C23F2E", +"X c #CF0E06", +"Y c #DE0606", +"Z c #E86060", +"` c #E34A4A", +" . c #FCEEEE", +".. c #E86363", +"+. c #E01C1C", +"@. c #DF0101", +"#. c #E00101", +"$. c #BE210E", +"%. c #C5291B", +"&. c #E11D1E", +"*. c #D71515", +"=. c #A1371B", +"-. c #D50403", +";. c #DE0000", +">. c #E30000", +",. c #E60000", +"'. c #E70000", +"). c #E70101", +"!. c #E91F1F", +"~. c #E5423E", +"{. c #C2432E", +"]. c #D8120A", +"^. c #E20000", +"/. c #E42929", +"(. c #F5B8B8", +"_. c #FAE3E3", +":. c #ED8989", +"<. c #E12828", +"[. c #E10000", +"}. c #E30202", +"|. c #CC3728", +"1. c #C3321E", +"2. c #E6201E", +"3. c #E70E0F", +"4. c #DD0202", +"5. c #D71C1B", +"6. c #C41108", +"7. c #DE0202", +"8. c #ED0000", +"9. c #F00000", +"0. c #EF0000", +"a. c #EE0202", +"b. c #EF2626", +"c. c #ED1212", +"d. c #E80000", +"e. c #E60909", +"f. c #E73737", +"g. c #F5B3B3", +"h. c #FEFBFB", +"i. c #EE8686", +"j. c #DF0707", +"k. c #EC2222", +"l. c #EE1B1B", +"m. c #F10000", +"n. c #EC0000", +"o. c #DF0E0E", +"p. c #B82B1A", +"q. c #AB250F", +"r. c #D90303", +"s. c #F20000", +"t. c #F60000", +"u. c #F70000", +"v. c #F50000", +"w. c #F40000", +"x. c #F30000", +"y. c #E40909", +"z. c #E32323", +"A. c #EE8484", +"B. c #FEF8F8", +"C. c #F29E9E", +"D. c #DB1C1B", +"E. c #C80905", +"F. c #DA0101", +"G. c #E50000", +"H. c #F80000", +"I. c #F90000", +"J. c #EA0000", +"K. c #E31B1B", +"L. c #FAE0E0", +"M. c #EC7676", +"N. c #FDF5F5", +"O. c #EC5656", +"P. c #EE0000", +"Q. c #DA0808", +"R. c #C3221A", +"S. c #A71F0D", +"T. c #CF0303", +"U. c #DA0000", +"V. c #E40000", +"W. c #FA0000", +"X. c #EB0000", +"Y. c #E11414", +"Z. c #E44B4B", +"`. c #F3ABAB", +" + c #F5ABAB", +".+ c #D80000", +"++ c #D21919", +"@+ c #9C3016", +"#+ c #BE0301", +"$+ c #E00000", +"%+ c #E40303", +"&+ c #DF1414", +"*+ c #FCEBEB", +"=+ c #EA7878", +"-+ c #EE8E8E", +";+ c #F5B0B0", +">+ c #DF0000", +",+ c #CA0202", +"'+ c #B2150B", +")+ c #B01709", +"!+ c #D00000", +"~+ c #E90000", +"{+ c #E51C1C", +"]+ c #F8D2D2", +"^+ c #FEFDFD", +"/+ c #EA7979", +"(+ c #F0A0A0", +"_+ c #EE7272", +":+ c #AC1C0B", +"<+ c #C21006", +"[+ c #E00707", +"}+ c #DF4040", +"|+ c #F9DBDB", +"1+ c #E01111", +"2+ c #C11106", +"3+ c #A92C12", +"4+ c #D90301", +"5+ c #DE0808", +"6+ c #ED8D8D", +"7+ c #F2B2B2", +"8+ c #E55555", +"9+ c #DF0404", +"0+ c #D60602", +"a+ c #BF1F0C", +"b+ c #E97B7B", +"c+ c #DC2B2B", +"d+ c #DC1010", +"e+ c #B52911", +"f+ c #C92317", +"g+ c #E30303", +"h+ c #DE3232", +"i+ c #E98383", +"j+ c #F5C5C5", +"k+ c #D50101", +"l+ c #E51515", +"m+ c #C04432", +"n+ c #AC2F1A", +"o+ c #D81E1E", +"p+ c #DD0C0C", +"q+ c #DD0000", +"r+ c #D90C0C", +"s+ c #F8D5D5", +"t+ c #EA9090", +"u+ c #F2B9B9", +"v+ c #D30000", +"w+ c #DE1C1C", +"x+ c #DC3E3D", +"y+ c #A64329", +"z+ c #983017", +"A+ c #C4231F", +"B+ c #D11313", +"C+ c #E14D4D", +"D+ c #F7D9D9", +"E+ c #DF5E5E", +"F+ c #FAE8E8", +"G+ c #D92D2D", +"H+ c #D40303", +"I+ c #D5292A", +"J+ c #C6443D", +"K+ c #AC261C", +"L+ c #C51A1A", +"M+ c #C80202", +"N+ c #DC0000", +"O+ c #D70101", +"P+ c #E36262", +"Q+ c #F3C4C4", +"R+ c #DB5353", +"S+ c #D21010", +"T+ c #C80606", +"U+ c #CC3737", +"V+ c #AE4235", +"W+ c #AE0706", +"X+ c #B90909", +"Y+ c #C00000", +"Z+ c #C90000", +"`+ c #D10000", +" @ c #D83535", +".@ c #FCF2F2", +"+@ c #DE6D6D", +"@@ c #F1BEBE", +"#@ c #CC0000", +"$@ c #BF0000", +"%@ c #BB1313", +"&@ c #A41B12", +"*@ c #8D2810", +"=@ c #B60000", +"-@ c #C10000", +";@ c #D31D1D", +">@ c #E17474", +",@ c #FBEEEE", +"'@ c #DF7474", +")@ c #CA0303", +"!@ c #CD0000", +"~@ c #B50000", +"{@ c #AB0A04", +"]@ c #BE0000", +"^@ c #C70000", +"/@ c #CC0202", +"(@ c #D12A2A", +"_@ c #D44545", +":@ c #EFBABA", +"<@ c #EAA4A4", +"[@ c #CB0909", +"}@ c #C60000", +"|@ c #BD0000", +"1@ c #A21408", +"2@ c #B90000", +"3@ c #C20000", +"4@ c #D03333", +"5@ c #F3CECE", +"6@ c #E07B7B", +"7@ c #E48888", +"8@ c #CB0000", +"9@ c #B70100", +"0@ c #BB0000", +"a@ c #C80000", +"b@ c #C50000", +"c@ c #CB2424", +"d@ c #F5D7D7", +"e@ c #D75C5C", +"f@ c #ECB3B3", +"g@ c #C40202", +"h@ c #BA0000", +"i@ c #991E0C", +"j@ c #B10100", +"k@ c #B50D05", +"l@ c #B80C05", +"m@ c #C30000", +"n@ c #C40000", +"o@ c #C61515", +"p@ c #EAA8A8", +"q@ c #EAAAAA", +"r@ c #E7A0A0", +"s@ c #C10202", +"t@ c #A51E0C", +"u@ c #903515", +"v@ c #BA0602", +"w@ c #B80000", +"x@ c #AF0301", +"y@ c #8C250F", +"z@ c #AF0000", +"A@ c #B30000", +"B@ c #B40201", +"C@ c #8A3414", +"D@ c #B00E06", +"E@ c #C51111", +"F@ c #E38E8E", +"G@ c #E69C9C", +"H@ c #D35656", +"I@ c #BE0202", +"J@ c #BC0101", +"K@ c #9D210D", +"L@ c #912C11", +"M@ c #AE0000", +"N@ c #8A2810", +"O@ c #A20301", +"P@ c #A70000", +"Q@ c #A80100", +"R@ c #8E230E", +"S@ c #AA0E06", +"T@ c #E18686", +"U@ c #CA2B2B", +"V@ c #C51E1E", +"W@ c #B70101", +"X@ c #93250F", +"Y@ c #941C0B", +"Z@ c #A90000", +"`@ c #990D05", +" # c #7F2810", +".# c #8F1307", +"+# c #A40E06", +"@# c #C41212", +"## c #D96666", +"$# c #BC0000", +"%# c #B30101", +"&# c #8F240E", +"*# c #940C05", +"=# c #9F0E06", +"-# c #B00000", +";# c #C01010", +"># c #D76868", +",# c #AF0101", +"'# c #8B240E", +")# c #990E06", +"!# c #AA0000", +"~# c #BE1818", +"{# c #D26161", +"]# c #AA0101", +"^# c #87240E", +"/# c #930E06", +"(# c #A40000", +"_# c #BC2424", +":# c #C12F2F", +"<# c #B10000", +"[# c #A40101", +"}# c #81250F", +"|# c #8D0E05", +"1# c #9D0000", +"2# c #A30000", +"3# c #AB0000", +"4# c #A20000", +"5# c #80220D", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" . + @ # # $ % & * ", +" = - ; > , ' ) > ; ! ~ ", +" { ] ^ / ( _ : < ^ [ } ", +" | 1 < 2 3 4 5 6 7 8 9 ", +" 0 < a b c d e f g h i ", +" j k l m n d o p q r s t u v w ", +" x y z A B C D E F G H I J K L M N O P ", +" Q R S T U V W X Y Z c ` ...+.@.#.$. %.&.J T S *.=. ", +" -.;.>.,.'.).!.~.{.].^./.(._.:.<.;.[.}.|.1.2.3.'.'.,.>.4.5. ", +" 6.7.'.8.9.9.9.0.a.b.c.d.e.f.g.h.i.j.>.,.k.l.8.0.9.m.0.n.,.o.p. ", +" q.r.>.n.s.t.u.t.v.w.x.9.8.d.y.z.A.B.C.>.d.n.9.x.v.t.u.v.s.n.>.D. ", +" E.F.G.0.w.H.I.I.I.H.t.x.0.J.G.K.L.M.N.O.d.8.s.t.H.I.I.u.w.P.G.Q.R. ", +" S.T.U.V.8.x.u.I.I.W.I.H.v.m.X.G.Y.q Z.`. +'.P.x.t.I.I.I.t.x.n.>..+++@+ ", +" #+] 6 $+d.0.x.t.H.H.H.u.w.9.J.%+&+*+=+-+;+,.n.s.t.u.u.t.x.P.'.>+m ,+'+ ", +" )+!+S ^.~+P.s.w.t.t.t.s.P.d.{+]+^+/+(+_+G.X.m.w.v.w.s.8.d.[..+1 :+ ", +" <+U.^.~+8.m.x.w.x.0.X.G.[+p B.}+|+1+G.X.0.m.s.9.8.d.^.S 2+ ", +" 3+4+V.~+8.9.m.9.n.d.^.5+6+ .7+8+9+V.J.P.0.0.8.~+>.0+ ", +" a+,.~+n.P.n.~+V.>+S b+|+c+d+>+V.~+n.8.n.~+G.e+ ", +" f+g+'.~+J.~+,.$+T h+i+j+k+S ;.V.'.J.X.J.,.l+m+ ", +" n+o+p+[.G.'.'.,.^.q+r+s+t+u+v+.+q+^.,.~+~+'.G.[.w+x+y+ ", +" z+A+B+k+T $+>.V.V.^.;.S C+D+E+F+G+6 T $+>.,.,.G.^.$+U.H+I+J+ ", +" K+L+M+^ 6 T >+[.^.[.$+N+O+P+Q+R+N.S+7 S ;.[.>.>.>.[.>+U.6 1 T+U+V+ ", +" W+X+Y+Z+`+g T q+>+$+;.N+S 2 @.@+@@@#@!+m U.q+>+$+$+;.q+T 6 !+Z+$@%@&@ ", +" *@=@-@] `+g U.T N+N+T S 6 < ;@>@,@'@)@!@< m S T N+q+N+T U.6 `+Z+$@~@ ", +" {@]@^@^ 7 g .+.+.+g m < ^ /@(@_@:@<@[@!@`+7 6 g .+.+.+g 7 1 }@|@1@ ", +" 2@3@] ^ < < < `+`+!+1 #@Z+^@4@5@6@7@Z+8@!@^ `+`+< v+`+^ Z+-@9@ ", +" 1@0@3@^@] 8@] ] Z+Z+Z+a@^@b@c@d@e@f@g@}@^@a@a@Z+] 8@] ^@3@h@i@ ", +" j@2@]@Y+-@Y+Y+k@ l@m@n@m@o@p@q@r@s@-@t@u@v@Y+Y+-@Y+|@w@x@ ", +" y@z@A@~@=@B@C@ D@$@Y+-@E@F@G@H@I@J@K@ L@=@=@~@A@M@N@ ", +" O@P@Q@R@ S@h@]@Y+E@T@U@V@0@W@X@ Y@Z@P@`@ ", +" #.# +#=@0@]@@###$@$#w@%#&# *# ", +" =#-#=@h@;#>#$#2@~@,#'# ", +" )#!#-#~@~#{#w@~@z@]#^# ", +" /#(#!#M@_#:#<#M@Z@[#}# ", +" |#1#2#P@!#3#!#P@4#1#5# ", +" ", +" ", +" ", +" ", +" ", +" "}; --- unixodbc-gui-qt-2.3.0.orig/ODBCTestQ4/Makefile.in +++ unixodbc-gui-qt-2.3.0/ODBCTestQ4/Makefile.in @@ -187,11 +187,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ --- unixodbc-gui-qt-2.3.0.orig/ODBCCreateDataSourceQ4/Makefile.in +++ unixodbc-gui-qt-2.3.0/ODBCCreateDataSourceQ4/Makefile.in @@ -165,11 +165,6 @@ STRIP = @STRIP@ UIC = @UIC@ VERSION = @VERSION@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@